[Emacs-diffs] /srv/bzr/emacs/trunk r99891: (init_tty): Move common text outside of #ifdef TERMINFO.

[Stefan Monnier]

------------------------------------------------------------
revno: 99891
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2010-04-12 22:19:17 -0400
message:
  (init_tty): Move common text outside of #ifdef TERMINFO.
modified:
  src/ChangeLog
  src/term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-13 02:07:48 +0000
+++ b/src/ChangeLog     2010-04-13 02:19:17 +0000
@@ -1,5 +1,7 @@
 2010-04-13  Stefan Monnier  <address@hidden>
 
+       * 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.

=== modified file 'src/term.c'
--- a/src/term.c        2010-03-13 09:02:01 +0000
+++ b/src/term.c        2010-04-13 02:19:17 +0000
@@ -3593,25 +3593,18 @@
     }
   if (status == 0)
     {
+      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"
 #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);
+"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 @@
     {
       maybe_fatal (must_succeed, terminal,
                    "Terminal type \"%s\" is not powerful enough to run Emacs",
+                   "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"
 # 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.",
+"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);
     }