(Fstart_process): GCPRO some things.

[bpt/emacs.git] / src / term.c

diff --git a/src/term.c b/src/term.c
index e84ab1c..fb8e80f 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -1,5 +1,5 @@
 /* terminal control module for terminals described by TERMCAP
-   Copyright (C) 1985, 1986, 1987, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,7 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include <stdio.h>
 #include <ctype.h>
-#include "config.h"
+#include <config.h>
 #include "termchar.h"
 #include "termopts.h"
 #include "cm.h"
@@ -338,8 +338,8 @@ update_end (f)
 {
   if (! FRAME_TERMCAP_P (updating_frame))
     {
-      (*update_end_hook) (f);
       updating_frame = 0;
+      (*update_end_hook) (f);
       return;
     }
   turn_off_insert ();
@@ -1229,6 +1229,9 @@ static struct fkey_table keys[] = {
   "k9",        "f9",
   };
 
+static char **term_get_fkeys_arg;
+static Lisp_Object term_get_fkeys_1 ();
+
 /* Find the escape codes sent by the function keys for Vfunction_key_map.
    This function scans the termcap function key sequence entries, and 
    adds entries to Vfunction_key_map for each function key it finds.  */
@@ -1236,10 +1239,29 @@ static struct fkey_table keys[] = {
 void
 term_get_fkeys (address)
      char **address;
+{
+  /* We run the body of the function (term_get_fkeys_1) and ignore all Lisp
+     errors during the call.  The only errors should be from Fdefine_key
+     when given a key sequence containing an invalid prefix key.  If the
+     termcap defines function keys which use a prefix that is already bound
+     to a command by the default bindings, we should silently ignore that
+     function key specification, rather than giving the user an error and
+     refusing to run at all on such a terminal.  */
+
+  extern Lisp_Object Fidentity ();
+  static Lisp_Object term_get_fkeys_1 ();
+  term_get_fkeys_arg = address;
+  internal_condition_case (term_get_fkeys_1, Qerror, Fidentity);
+}
+
+static Lisp_Object
+term_get_fkeys_1 ()
 {
   extern char *tgetstr ();
   int i;
 
+  char **address = term_get_fkeys_arg;
+
   /* This can happen if CANNOT_DUMP or with strange options.  */
   if (!initialized)
     Vfunction_key_map = Fmake_sparse_keymap (Qnil);
@@ -1248,9 +1270,9 @@ term_get_fkeys (address)
     {
       char *sequence = tgetstr (keys[i].cap, address);
       if (sequence)
-       Fdefine_key (Vfunction_key_map,
-                    build_string (sequence),
-                    Fmake_vector (make_number (1), intern (keys[i].name)));
+       Fdefine_key (Vfunction_key_map, build_string (sequence),
+                    Fmake_vector (make_number (1),
+                                  intern (keys[i].name)));
     }
 
   /* The uses of the "k0" capability are inconsistent; sometimes it
@@ -1265,15 +1287,13 @@ term_get_fkeys (address)
 
     if (k_semi)
       {
-       Fdefine_key (Vfunction_key_map,
-                    build_string (k_semi),
+       Fdefine_key (Vfunction_key_map, build_string (k_semi),
                     Fmake_vector (make_number (1), intern ("f10")));
        k0_name = "f0";
       }
 
     if (k0)
-      Fdefine_key (Vfunction_key_map,
-                  build_string (k0),
+      Fdefine_key (Vfunction_key_map, build_string (k0),
                   Fmake_vector (make_number (1), intern (k0_name)));
   }
 
@@ -1295,10 +1315,10 @@ term_get_fkeys (address)
          char *sequence = tgetstr (fcap, address);
          if (sequence)
            {
-             (void) sprintf (fkey, "f%d", i);      
-             Fdefine_key (Vfunction_key_map,
-                          build_string (sequence),
-                          Fmake_vector (make_number (1), intern (fkey)));
+             sprintf (fkey, "f%d", i);
+             Fdefine_key (Vfunction_key_map, build_string (sequence),
+                          Fmake_vector (make_number (1),
+                                        intern (fkey)));
            }
        }
       }
@@ -1313,15 +1333,15 @@ term_get_fkeys (address)
        {                                                               \
          char *sequence = tgetstr (cap2, address);                     \
          if (sequence)                                                 \
-           Fdefine_key (Vfunction_key_map,                             \
-                        build_string (sequence),                       \
-                        Fmake_vector (make_number (1), intern (sym))); \
+           Fdefine_key (Vfunction_key_map, build_string (sequence),    \
+                        Fmake_vector (make_number (1), \
+                                      intern (sym)));  \
        }
          
       /* if there's no key_next keycap, map key_npage to `next' keysym */
       CONDITIONAL_REASSIGN ("%5", "kN", "next");
       /* if there's no key_prev keycap, map key_ppage to `previous' keysym */
-      CONDITIONAL_REASSIGN ("%8", "kP", "previous");
+      CONDITIONAL_REASSIGN ("%8", "kP", "prior");
       /* if there's no key_dc keycap, map key_ic to `insert' keysym */
       CONDITIONAL_REASSIGN ("kD", "kI", "insert");
 #undef CONDITIONAL_REASSIGN
@@ -1347,7 +1367,12 @@ term_init (terminal_type)
   if (status < 0)
     fatal ("Cannot open termcap database file.\n");
   if (status == 0)
-    fatal ("Terminal type %s is not defined.\n", terminal_type);
+    fatal ("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.\n",
+          terminal_type);
 
 #ifdef TERMINFO
   area = (char *) malloc (2044);
@@ -1479,6 +1504,17 @@ term_init (terminal_type)
       TS_standout_mode = tgetstr ("us", address);
     }
 
+  /* If no `se' string, try using a `me' string instead.
+     If that fails, we can't use standout mode at all.  */
+  if (TS_end_standout_mode == 0)
+    {
+      char *s = tgetstr ("me");
+      if (s != 0)
+       TS_end_standout_mode = s;
+      else
+       TS_standout_mode = 0;
+    }
+
   if (TF_teleray)
     {
       Wcm.cm_tab = 0;
@@ -1558,8 +1594,9 @@ or `define EMACS_TERM \"terminal type\"' for non-DEC terminals.\n",
     fatal ("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 C-shell command `setenv TERM ...' to specify the correct type.\n\
-It may be necessary to do `unsetenv TERMCAP' as well.\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.\n",
           terminal_type);
 #endif
   if (FRAME_HEIGHT (selected_frame) <= 0