*** empty log message ***

13 files changed, 92 insertions, 67 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index bd6646da5fc..55000f571eb 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -3,7 +3,6 @@ define pr
 set Fprin1 ($, Qexternal_debugging_output)
 echo \n
 end
-
 document pr
 Print the emacs s-expression which is $.
 Works only when an inferior emacs is executing.
@@ -13,73 +12,105 @@ define xtype
 print (enum Lisp_Type) (($ >> 24) & 0x7f)
 p $$
 end
+document xtype
+Print the type of $, assuming it is an Elisp value.
+end
 
 define xint
 print (($ & 0x00ffffff) << 8) >> 8
 end
+document xint
+Print $, assuming it is an Elisp integer.  This gets the sign right.
+end
 
 define xptr
 print (void *) ($ & 0x00ffffff)
 end
+document xptr
+Print the pointer portion of $, assuming it is an Elisp value.
+end
 
 define xwindow
 print (struct window *) ($ & 0x00ffffff)
 end
+document xwindow
+Print $ as a window pointer, assuming it is an Elisp window value.
+end
 
 define xmarker
 print (struct Lisp_Marker *) ($ & 0x00ffffff)
 end
+document xmarker
+Print $ as a marker pointer, assuming it is an Elisp marker value.
+end
 
 define xbuffer
 print (struct buffer *) ($ & 0x00ffffff)
 end
+document xbuffer
+Print $ as a buffer pointer, assuming it is an Elisp buffer value.
+end
 
 define xsymbol
 print (struct Lisp_Symbol *) ($ & 0x00ffffff)
 print &$->name->data
 print $$
 end
+document xsymbol
+Print the name and address of the symbol $.
+This command assumes that $ is an Elisp symbol value.
+end
 
 define xstring
 print (struct Lisp_String *) ($ & 0x00ffffff)
-print ($->data[0])@($->size)
+print ($->size > 10000) ? "big string" : ($->data[0])@($->size)
 print $$
 end
-
 document xstring
-Assume that $ is an Emacs Lisp string object, print the string's
-contents, and set $ to a pointer to the string.
+Print the contents and address of the string $.
+This command assumes that $ is an Elisp string value.
 end
 
 define xvector
 set $temp = (struct Lisp_Vector *) ($ & 0x00ffffff)
-print ($temp->contents[0])@($temp->size)
+print ($temp->size > 10000) ? "big vector" : ($temp->contents[0])@($temp->size)
 print $temp
 end
-
 document xvector
-Assume that $ is an Emacs Lisp vector object, print the vector's
-contents, and set $ to a pointer to the vector.
+Print the contents and address of the vector $.
+This command assumes that $ is an Elisp vector value.
 end
 
 define xscreen
 print (struct screen *) ($ & 0x00ffffff)
 end
+document xwindow
+Print $ as a screen pointer, assuming it is an Elisp screen value.
+end
 
 define xcons
 print (struct Lisp_Cons *) ($ & 0x00ffffff)
 print *$
 end
+document xcons
+Print the contents of $, assuming it is an Elisp cons.
+end
 
 define xcar
 print ((($ >> 24) & 0x7f) == Lisp_Cons ? ((struct Lisp_Cons *) ($ & 0x00ffffff))->car : 0)
 end
+document xcar
+Print the car of $, assuming it is an Elisp pair.
+end
 
 define xcdr
 print ((($ >> 24) & 0x7f) == Lisp_Cons ? ((struct Lisp_Cons *) ($ & 0x00ffffff))->cdr : 0)
 end
+document xcdr
+Print the cdr of $, assuming it is an Elisp pair.
+end
 
-set prettyprint on
+set print pretty on
 
 # Don't let abort actually run, as it will make
 # stdio stop working and therefore the `pr' command below as well.
@@ -90,8 +121,8 @@ break abort
 # instead...
 break _XPrintDefaultError
 
-unset env TERMCAP
-unset env TERM
-set env DISPLAY :0.0
-info env DISPLAY
+unset environment TERMCAP
+unset environment TERM
+set environment DISPLAY :0.0
+show environment DISPLAY
 set args -q
diff --git a/src/alloc.c b/src/alloc.c
index b4637970dd7..9b7da1d0f5b 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -29,6 +29,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif  /* MULTI_SCREEN */
 #endif
 
+#include "syssignal.h"
+
 #define max(A,B) ((A) > (B) ? (A) : (B))
 
 /* Macro to verify that storage intended for Lisp objects is not
@@ -549,11 +551,11 @@ DEFUN ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0,
 {
   register Lisp_Object val;
   register struct Lisp_Marker *p;
+
   /* Detact the bug that seems to have caused this to be called from
      a signal handler.  */
-  int mask, dummy;
-  EMACS_SIGSETMASK (-1, mask);
-  EMACS_SIGSETMASK (mask, dummy);
+  SIGMASKTYPE mask;
+  mask = sigblock (SIGEMPTYMASK);
   if (mask != 0)
     abort ();
 
diff --git a/src/callproc.c b/src/callproc.c
index 1a564ad7ccc..9544ecf0a21 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -195,12 +195,9 @@ If you quit, the process is killed with SIGKILL.")
        Protect it from permanent change.  */
     register char **save_environ = environ;
     register int fd1 = fd[1];
-    char **env;
-
-    env = environ;
 
 #if 0  /* Some systems don't have sigblock.  */
-    EMACS_SIGBLOCK (sigmask (SIGCHLD), mask);
+    mask = sigblock (sigmask (SIGCHLD));
 #endif
 
     /* Record that we're about to create a synchronous process.  */
@@ -217,18 +214,14 @@ If you quit, the process is killed with SIGKILL.")
 #else
         setpgrp (pid, pid);
 #endif /* USG */
-        child_setup (filefd, fd1, fd1, new_argv, env, 0, current_dir);
+        child_setup (filefd, fd1, fd1, new_argv, 0, current_dir);
       }
 
 #if 0
     /* Tell SIGCHLD handler to look for this pid.  */
     synch_process_pid = pid;
     /* Now let SIGCHLD come through.  */
-    {
-      int dummy;
-
-      EMACS_SIGSETMASK (mask, dummy);
-    }
+    sigsetmask (mask);
 #endif
 
     environ = save_environ;
@@ -368,13 +361,14 @@ If you quit, the process is killed with SIGKILL.")
    a decent error from within the child, this should be verified as an
    executable directory by the parent.  */
 
-child_setup (in, out, err, new_argv, env, set_pgrp, current_dir)
+child_setup (in, out, err, new_argv, set_pgrp, current_dir)
      int in, out, err;
      register char **new_argv;
-     char **env;
      int set_pgrp;
      Lisp_Object current_dir;
 {
+  char **env;
+
   register int pid = getpid();
 
   setpriority (PRIO_PROCESS, pid, 0);
@@ -424,7 +418,7 @@ child_setup (in, out, err, new_argv, env, set_pgrp, current_dir)
     /* new_length + 1 to include terminating 0 */
     env = new_env = (char **) alloca ((new_length + 1) * sizeof (char *));
 
-    /* Copy the env strings into new_env.  */
+    /* Copy the Vprocess_alist strings into new_env.  */
     for (tem = Vprocess_environment;
          (XTYPE (tem) == Lisp_Cons
           && XTYPE (XCONS (tem)->car) == Lisp_String);
diff --git a/src/data.c b/src/data.c
index 48af4ec9149..4e95494d593 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1959,11 +1959,7 @@ arith_error (signo)
 #ifdef BSD4_1
   sigrelse (SIGFPE);
 #else /* not BSD4_1 */
-  {
-    int dummy;
-
-    EMACS_SIGSETMASK (SIGEMPTYMASK, dummy);
-  }
+  sigsetmask (SIGEMPTYMASK);
 #endif /* not BSD4_1 */
 
   Fsignal (Qarith_error, Qnil);
diff --git a/src/emacs.c b/src/emacs.c
index 90a86b26723..104ba671253 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -721,7 +721,10 @@ decode_env_path (evarname, defalt)
   /* It's okay to use getenv here, because this function is only used
      to initialize variables when Emacs starts up, and isn't called
      after that.  */
-  path = (char *) getenv (evarname);
+  if (evarname != 0)
+    path = (char *) getenv (evarname);
+  else
+    path = 0;
   if (!path)
     path = defalt;
   lpath = Qnil;
diff --git a/src/filelock.c b/src/filelock.c
index 7a473753e58..b76ee689d55 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -65,7 +65,7 @@ char *superlock_path;
 
 /* Set LOCK to the name of the lock file for the filename FILE.
    char *LOCK; Lisp_Object FILE;  */
-#define MAKE_LOCK_PATH (lock, file) \
+#define MAKE_LOCK_PATH(lock, file) \
   (lock = (char *) alloca (XSTRING (file)->size + strlen (lock_path) + 1), \
    fill_in_lock_file_name (lock, (file)))
 
diff --git a/src/floatfns.c b/src/floatfns.c
index c99ba487e71..20b90e63a85 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -22,6 +22,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "config.h"
 #include "lisp.h"
+#include "syssignal.h"
 
 Lisp_Object Qarith_error;
 
@@ -509,11 +510,7 @@ float_error (signo)
 #ifdef BSD4_1
   sigrelse (SIGILL);
 #else /* not BSD4_1 */
-  {
-    int dummy;
-
-    EMACS_SIGSETMASK (0, dummy);
-  }
+  sigsetmask (SIGEMPTYMASK);
 #endif /* not BSD4_1 */
 #else
   /* Must reestablish handler each time it is called.  */
diff --git a/src/keyboard.c b/src/keyboard.c
index 122fa247c39..e6139cfaf11 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2105,9 +2105,9 @@ gobble_input (expected)
   if (interrupt_input)
     {
       SIGMASKTYPE mask;
-      EMACS_SIGBLOCKX (SIGIO, mask);
+      mask = sigblockx (SIGIO);
       read_avail_input (expected);
-      EMACS_SIGSETMASK (mask, mask);
+      sigsetmask (mask);
     }
   else
 #endif
diff --git a/src/lisp.h b/src/lisp.h
index c7dd07058eb..b263370dac6 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -269,7 +269,7 @@ Lisp_Object;
 /* Extract the value of a Lisp_Object as a signed integer.  */
 
 #ifndef XINT   /* Some machines need to do this differently.  */
-#define XINT(a) (((a) << INTBITS-VALBITS) >> INTBITS-VALBITS)
+#define XINT(a) (((a) << (INTBITS-VALBITS)) >> (INTBITS-VALBITS))
 #endif
 
 /* Extract the value as an unsigned integer.  This is a basis
diff --git a/src/lread.c b/src/lread.c
index c3157c8d618..5ffa1ea5183 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1436,7 +1436,7 @@ init_lread ()
   /* Compute the default load-path.  */
 #ifdef CANNOT_DUMP
   normal = PATH_LOADSEARCH;
-  Vload_path = decode_env_path ("", normal);
+  Vload_path = decode_env_path (0, normal);
 #else
   if (NILP (Vpurify_flag))
     normal = PATH_LOADSEARCH;
@@ -1452,12 +1452,12 @@ init_lread ()
     {
       Lisp_Object dump_path;
 
-      dump_path = decode_env_path ("", PATH_DUMPLOADSEARCH);
+      dump_path = decode_env_path (0, PATH_DUMPLOADSEARCH);
       if (! NILP (Fequal (dump_path, Vload_path)))
-        Vload_path = decode_env_path ("", normal);
+        Vload_path = decode_env_path (0, normal);
     }
   else
-    Vload_path = decode_env_path ("", normal);
+    Vload_path = decode_env_path (0, normal);
 #endif
 
   /* Warn if dirs in the *standard* path don't exist.  */
diff --git a/src/process.c b/src/process.c
index d9e2734957f..9ba48ef7d56 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1109,11 +1109,8 @@ create_process (process, new_argv)
 #endif
   int pty_flag = 0;
   Lisp_Object current_dir;
-  char **env;
   extern char **environ;
 
-  env = environ;
-
   inchannel = outchannel = -1;
 
 #ifdef HAVE_PTYS
@@ -1318,7 +1315,7 @@ create_process (process, new_argv)
 
         child_setup_tty (xforkout);
         child_setup (xforkin, xforkout, xforkout,
-                     new_argv, env, 1, current_dir);
+                     new_argv, 1, current_dir);
       }
     environ = save_environ;
   }
diff --git a/src/search.c b/src/search.c
index 886f93f41c0..bd962d21491 100644
--- a/src/search.c
+++ b/src/search.c
@@ -111,11 +111,11 @@ signal_failure (arg)
 }
 
 DEFUN ("looking-at", Flooking_at, Slooking_at, 1, 1, 0,
-  "Return t if text after point matches regular expression PAT.
-This function modifies the match data that `match-beginning',
-`match-end' and `match-data' access; save and restore the match
+  "Return t if text after point matches regular expression PAT.\n\
+This function modifies the match data that `match-beginning',\n\
+`match-end' and `match-data' access; save and restore the match\n\
 data if you want to preserve them.")
-")
+  "Return t if text after point matches regular expression PAT.")
   (string)
      Lisp_Object string;
 {
diff --git a/src/sysdep.c b/src/sysdep.c
index 62980380a68..5f6090a2460 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -638,11 +638,7 @@ reset_sigio ()
 request_sigio ()
 {
 #ifdef SIGWINCH
-  {
-    int dummy;
-
-    EMACS_SIGUNBLOCKX (SIGWINCH, dummy);
-  }
+  sigunblock (sigmask (SIGWINCH));
 #endif
   fcntl (0, F_SETFL, old_fcntl_flags | FASYNC);
 
@@ -652,11 +648,7 @@ request_sigio ()
 unrequest_sigio ()
 {
 #ifdef SIGWINCH
-  {
-    int dummy;
-    
-    EMACS_SIGBLOCK (SIGWINCH, dummy);
-  }
+  sigblock (sigmask (SIGWINCH));
 #endif
   fcntl (0, F_SETFL, old_fcntl_flags);
   interrupts_deferred = 1;
@@ -1882,6 +1874,19 @@ sys_signal (int signal_number, signal_handler_t action)
 #endif /* DGUX */
 }
 
+#ifndef __GNUC__
+/* If we're compiling with GCC, we don't need this function, since it
+   can be written as a macro.  */
+sigset_t
+sys_sigmask (int sig)
+{
+  sigset_t mask;
+  sigemptyset (&mask);
+  sigaddset (&mask, sig);
+  return mask;
+}
+#endif
+
 int
 sys_sigpause (sigset_t new_mask)
 {