diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-04-12 22:19:17 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-04-12 22:19:17 -0400 |
commit | 84164a0dc12bacef378a267e7f2b18dd371be16f (patch) | |
tree | d85210358273b9f59cdc54b26c5a70d7a2e89b16 /src/term.c | |
parent | 2b0a91e78f83fb446cc38efb99399e83ad2cded3 (diff) | |
download | emacs-84164a0dc12bacef378a267e7f2b18dd371be16f.tar.gz |
(init_tty): Move common text outside of #ifdef TERMINFO.
Diffstat (limited to 'src/term.c')
-rw-r--r-- | src/term.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/term.c b/src/term.c index 718a20d4164..df7dc9ee464 100644 --- a/src/term.c +++ b/src/term.c @@ -3593,25 +3593,18 @@ init_tty (char *name, char *terminal_type, int must_succeed) } if (status == 0) { -#ifdef TERMINFO maybe_fatal (must_succeed, terminal, "Terminal type %s is not defined", "Terminal type %s is not defined.\n\ If that is not the actual type of terminal you have,\n\ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ -`setenv TERM ...') to specify the correct type. It may be necessary\n\ -to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well.", - terminal_type); +`setenv TERM ...') to specify the correct type. It may be necessary\n" +#ifdef TERMINFO +"to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well.", #else - maybe_fatal (must_succeed, terminal, - "Terminal type %s is not defined", - "Terminal type %s is not defined.\n\ -If that is not the actual type of terminal you have,\n\ -use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ -`setenv TERM ...') to specify the correct type. It may be necessary\n\ -to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", - terminal_type); +"to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", #endif + terminal_type); } #ifndef TERMINFO @@ -3878,20 +3871,15 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", { maybe_fatal (must_succeed, terminal, "Terminal type \"%s\" is not powerful enough to run Emacs", -# ifdef TERMINFO "Terminal type \"%s\" is not powerful enough to run Emacs.\n\ It lacks the ability to position the cursor.\n\ If that is not the actual type of terminal you have,\n\ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ -`setenv TERM ...') to specify the correct type. It may be necessary\n\ -to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well.", +`setenv TERM ...') to specify the correct type. It may be necessary\n" +# ifdef TERMINFO +"to do `unset TERMINFO' (C-shell: `unsetenv TERMINFO') as well.", # else /* TERMCAP */ - "Terminal type \"%s\" is not powerful enough to run Emacs.\n\ -It lacks the ability to position the cursor.\n\ -If that is not the actual type of terminal you have,\n\ -use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ -`setenv TERM ...') to specify the correct type. It may be necessary\n\ -to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", +"to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.", # endif /* TERMINFO */ terminal_type); } |