Mercurial > emacs

changeset 107847:e81bca2fba28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(init_tty): Move common text outside of #ifdef TERMINFO.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 12 Apr 2010 22:19:17 -0400
parents e8ea73860300
children a1e70223994f
files src/ChangeLog src/term.c
diffstat 2 files changed, 11 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Apr 12 22:07:48 2010 -0400
+++ b/src/ChangeLog	Mon Apr 12 22:19:17 2010 -0400
@@ -1,5 +1,7 @@
 2010-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* term.c (init_tty): Move common text outside of #ifdef TERMINFO.
+
 	Try to solve the problem of spurious EOF chars in long lines of text
 	sent to interactive subprocesses.
 	* sysdep.c (child_setup_tty): Do not enable ICANON any more.
--- a/src/term.c	Mon Apr 12 22:07:48 2010 -0400
+++ b/src/term.c	Mon Apr 12 22:19:17 2010 -0400
@@ -3593,25 +3593,18 @@
     }
   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.",
+"to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.",
+#endif
                    terminal_type);
-#endif
     }
 
 #ifndef TERMINFO
@@ -3878,20 +3871,15 @@
     {
       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);
     }