Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-489
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-490
   Update from CVS: man/fixit.texi (Spelling): Fix typo.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-491
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-492
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-493
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-494
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-495
   Update from CVS: Add missing lisp/mh-e files

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-496
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-497
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-498
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-499
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-500
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-234

8 files changed, 122 insertions, 32 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3f9b6d85e51..9d9c4ee498c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,40 @@
+2004-08-18  Kim F. Storm  <storm@cua.dk>
+
+        * process.c (Faccept_process_output): Add arg JUST-THIS-ONE;
+        forward to wait_reading_process_input via DO_DISPLAY arg.
+        (wait_reading_process_input): If DO_DISPLAY < 0 for a process
+        object, only process output from that process; also inhibit
+        running timers if DO_DISPLAY==-2.
+
+2004-08-17  Kim F. Storm  <storm@cua.dk>
+
+        * process.c (process_send_signal): Fix last change--use
+        _POSIX_VDISABLE instead of CVDISABLE when available.
+
+2004-08-16  Richard M. Stallman  <rms@gnu.org>
+
+        * sysdep.c (child_setup_tty) [SIGNALS_VIA_CHARACTERS]:
+        Set VQUIT and VINTR chars to the standard ones if they are unset.
+        [AIX]: Don't do that here.  And don't force VINTR to standard
+        when SIGNALS_VIA_CHARACTERS.
+
+        * process.c (process_send_signal)
+        [SIGNALS_VIA_CHARACTERS, HAVE_TERMIOS]: Clean up.
+        Do nothing if the character is CVDISABLE.
+
+        * xfaces.c (merge_face_ref): Specifying `unspecified' is a no-op.
+
+        * intervals.c (move_if_not_intangible):
+        Force POSITION to be between BEGV and ZV.
+
+2004-08-14  John Paul Wallington  <jpw@gnu.org>
+
+        * buffer.c (Frestore_buffer_modified_p): Doc fix.
+
+        * fileio.c (Fread_file_name): Doc fix.
+
+        * minibuf.c (syms_of_minibuf) <completion-ignore-case>: Doc fix.
+
 2004-08-09  Luc Teirlinck  <teirllm@auburn.edu>
 
         * keymap.c (Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
@@ -66,6 +103,10 @@
 
         * callint.c (Fcall_interactively): Doc fix.
 
+2004-07-30  Richard M. Stallman  <rms@gnu.org>
+
+        * abbrev.c (Fexpand_abbrev): Undo previous change.
+
 2004-07-30  Kim F. Storm  <storm@cua.dk>
 
         * editfns.c (Fformat): Allocate extra (dummy) element in info.
diff --git a/src/buffer.c b/src/buffer.c
index f55ae7983f4..bade501b1a7 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1077,7 +1077,7 @@ A non-nil FLAG means mark the buffer modified.  */)
 
 DEFUN ("restore-buffer-modified-p", Frestore_buffer_modified_p,
        Srestore_buffer_modified_p, 1, 1, 0,
-       doc: /* Like `set-buffer-modified-p', with a differences concerning redisplay.
+       doc: /* Like `set-buffer-modified-p', with a difference concerning redisplay.
 It is not ensured that mode lines will be updated to show the modified
 state of the current buffer.  Use with care.  */)
      (flag)
diff --git a/src/fileio.c b/src/fileio.c
index 180f6f94130..da544f72234 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6195,7 +6195,10 @@ DIR should be an absolute directory name.  It defaults to the value of
 
 If this command was invoked with the mouse, use a file dialog box if
 `use-dialog-box' is non-nil, and the window system or X toolkit in use
-provides a file dialog box.  */)
+provides a file dialog box.
+
+See also `read-file-name-completion-ignore-case'
+and `read-file-name-function'.  */)
      (prompt, dir, default_filename, mustmatch, initial, predicate)
      Lisp_Object prompt, dir, default_filename, mustmatch, initial, predicate;
 {
diff --git a/src/intervals.c b/src/intervals.c
index 33ef9a34177..a822dafefcf 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -2275,6 +2275,10 @@ move_if_not_intangible (position)
           pos = Fnext_char_property_change (pos, Qnil);
 
     }
+  else if (position < BEGV)
+    position = BEGV;
+  else if (position > ZV)
+    position = ZV;
 
   /* If the whole stretch between PT and POSITION isn't intangible,
      try moving to POSITION (which means we actually move farther
diff --git a/src/minibuf.c b/src/minibuf.c
index d28a5799afa..3d2c6c3a475 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2678,7 +2678,10 @@ property of a history variable overrides this default.  */);
   Vcompletion_auto_help = Qt;
 
   DEFVAR_BOOL ("completion-ignore-case", &completion_ignore_case,
-               doc: /* Non-nil means don't consider case significant in completion.  */);
+               doc: /* Non-nil means don't consider case significant in completion.
+
+See also `read-file-name-completion-ignore-case' concerning case significance
+in completion when reading a file name.  */);
   completion_ignore_case = 0;
 
   DEFVAR_BOOL ("enable-recursive-minibuffers", &enable_recursive_minibuffers,
diff --git a/src/process.c b/src/process.c
index ff3f79158ca..1cebdf07875 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3718,7 +3718,7 @@ close_process_descs ()
 }
 
 DEFUN ("accept-process-output", Faccept_process_output, Saccept_process_output,
-       0, 3, 0,
+       0, 4, 0,
        doc: /* Allow any pending output from subprocesses to be read by Emacs.
 It is read into the process' buffers or given to their filter functions.
 Non-nil arg PROCESS means do not return until some output has been received
@@ -3726,15 +3726,20 @@ from PROCESS.
 Non-nil second arg TIMEOUT and third arg TIMEOUT-MSECS are number of
 seconds and microseconds to wait; return after that much time whether
 or not there is input.
+If optional fourth arg JUST-THIS-ONE is non-nil, only accept output
+from PROCESS, suspending reading output from other processes.
+If JUST-THIS-ONE is an integer, don't run any timers either.
 Return non-nil iff we received any output before the timeout expired.  */)
-     (process, timeout, timeout_msecs)
-     register Lisp_Object process, timeout, timeout_msecs;
+     (process, timeout, timeout_msecs, just_this_one)
+     register Lisp_Object process, timeout, timeout_msecs, just_this_one;
 {
   int seconds;
   int useconds;
 
   if (! NILP (process))
     CHECK_PROCESS (process);
+  else
+    just_this_one = Qnil;
 
   if (! NILP (timeout_msecs))
     {
@@ -3776,7 +3781,9 @@ Return non-nil iff we received any output before the timeout expired.  */)
     XSETFASTINT (process, 0);
 
   return
-    (wait_reading_process_input (seconds, useconds, process, 0)
+    (wait_reading_process_input (seconds, useconds, process,
+                                 NILP (just_this_one) ? 0 :
+                                 !INTEGERP (just_this_one) ? -1 : -2)
      ? Qt : Qnil);
 }
 
@@ -4009,8 +4016,11 @@ wait_reading_process_input_1 ()
        process.  The return value is true iff we read some input from
        that process.
 
-   DO_DISPLAY != 0 means redisplay should be done to show subprocess
-   output that arrives.
+   If READ_KBD is a process object, DO_DISPLAY < 0 means handle only
+     output from that process (suspending output from other processes)
+     and DO_DISPLAY == -2 specifically means don't run any timers either.
+   Otherwise, != 0 means redisplay should be done to show subprocess
+     output that arrives.
 
    If READ_KBD is a pointer to a struct Lisp_Process, then the
      function returns true iff we received input from that process
@@ -4032,6 +4042,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
   EMACS_TIME timeout, end_time;
   int wait_channel = -1;
   struct Lisp_Process *wait_proc = 0;
+  int just_wait_proc = 0;
   int got_some_input = 0;
   /* Either nil or a cons cell, the car of which is of interest and
      may be changed outside of this routine.  */
@@ -4048,6 +4059,11 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
       wait_proc = XPROCESS (read_kbd);
       wait_channel = XINT (wait_proc->infd);
       XSETFASTINT (read_kbd, 0);
+      if (do_display < 0)
+        {
+          just_wait_proc = do_display;
+          do_display = 0;
+        }
     }
 
   /* If waiting for non-nil in a cell, record where.  */
@@ -4122,7 +4138,8 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
          But not if wait_for_cell; in those cases,
          the wait is supposed to be short,
          and those callers cannot handle running arbitrary Lisp code here.  */
-      if (NILP (wait_for_cell))
+      if (NILP (wait_for_cell)
+          && just_wait_proc != -2)
         {
           EMACS_TIME timer_delay;
 
@@ -4258,7 +4275,12 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
 
       /* Wait till there is something to do */
 
-      if (!NILP (wait_for_cell))
+      if (just_wait_proc)
+        {
+          FD_SET (XINT (wait_proc->infd), &Available);
+          check_connect = check_delay = 0;
+        }
+      else if (!NILP (wait_for_cell))
         {
           Available = non_process_wait_mask;
           check_connect = check_delay = 0;
@@ -5549,29 +5571,40 @@ process_send_signal (process, signo, current_group, nomsg)
          work.  If the system has it, use it.  */
 #ifdef HAVE_TERMIOS
       struct termios t;
+      cc_t *sig_char = NULL;
+
+      tcgetattr (XINT (p->infd), &t);
 
       switch (signo)
         {
         case SIGINT:
-          tcgetattr (XINT (p->infd), &t);
-          send_process (proc, &t.c_cc[VINTR], 1, Qnil);
-          return;
+          sig_char = &t.c_cc[VINTR];
+          break;
 
         case SIGQUIT:
-          tcgetattr (XINT (p->infd), &t);
-          send_process (proc, &t.c_cc[VQUIT], 1, Qnil);
-          return;
+          sig_char = &t.c_cc[VQUIT];
+          break;
 
         case SIGTSTP:
-          tcgetattr (XINT (p->infd), &t);
 #if defined (VSWTCH) && !defined (PREFER_VSUSP)
-          send_process (proc, &t.c_cc[VSWTCH], 1, Qnil);
+          sig_char = &t.c_cc[VSWTCH];
 #else
-          send_process (proc, &t.c_cc[VSUSP], 1, Qnil);
+          sig_char = &t.c_cc[VSUSP];
 #endif
-          return;
+          break;
         }
 
+#ifndef _POSIX_VDISABLE
+#ifdef CVDISABLE
+#define _POSIX_VDISABLE CVDISABLE
+#else
+#define _POSIX_VDISABLE '\0'
+#endif
+#endif
+
+      if (sig_char && *sig_char != _POSIX_VDISABLE)
+        send_process (proc, sig_char, 1, Qnil);
+      return;
 #else /* ! HAVE_TERMIOS */
 
       /* On Berkeley descendants, the following IOCTL's retrieve the
diff --git a/src/sysdep.c b/src/sysdep.c
index 018fdc1fd57..26f433c9a1d 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -607,6 +607,15 @@ child_setup_tty (out)
   s.main.c_cflag = (s.main.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */
 #endif /* HPUX */
 
+#ifdef SIGNALS_VIA_CHARACTERS
+  /* the QUIT and INTR character are used in process_send_signal
+     so set them here to something useful.  */
+  if (s.main.c_cc[VQUIT] == 0377)
+    s.main.c_cc[VQUIT] = '\\'&037;      /* Control-\ */
+  if (s.main.c_cc[VINTR] == 0377)
+    s.main.c_cc[VINTR] = 'C'&037;       /* Control-C */
+#endif /* not SIGNALS_VIA_CHARACTERS */
+
 #ifdef AIX
 /* AIX enhanced edit loses NULs, so disable it */
 #ifndef IBMR2AIX
@@ -617,16 +626,10 @@ child_setup_tty (out)
      don't ignore break, but don't signal either, so it looks like NUL.  */
   s.main.c_iflag &= ~IGNBRK;
   s.main.c_iflag &= ~BRKINT;
-  /* QUIT and INTR work better as signals, so disable character forms */
-  s.main.c_cc[VINTR] = 0377;
-#ifdef SIGNALS_VIA_CHARACTERS
-  /* the QUIT and INTR character are used in process_send_signal
-     so set them here to something useful.  */
-  if (s.main.c_cc[VQUIT] == 0377)
-    s.main.c_cc[VQUIT] = '\\'&037;      /* Control-\ */
-  if (s.main.c_cc[VINTR] == 0377)
-    s.main.c_cc[VINTR] = 'C'&037;       /* Control-C */
-#else /* no TIOCGPGRP or no TIOCGLTC or no TIOCGETC */
+  /* rms: Formerly it set s.main.c_cc[VINTR] to 0377 here
+     unconditionally.  Then a SIGNALS_VIA_CHARACTERS conditional
+     would force it to 0377.  That looks like duplicated code.  */
+#ifndef SIGNALS_VIA_CHARACTERS
   /* QUIT and INTR work better as signals, so disable character forms */
   s.main.c_cc[VQUIT] = 0377;
   s.main.c_cc[VINTR] = 0377;
diff --git a/src/xfaces.c b/src/xfaces.c
index f664249a290..10b7ef1148c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3629,7 +3629,10 @@ merge_face_ref (f, face_ref, to, err_msgs, named_merge_points)
               Lisp_Object value = XCAR (XCDR (face_ref));
               int err = 0;
 
-              if (EQ (keyword, QCfamily))
+              /* Specifying `unspecified' is a no-op.  */
+              if (EQ (value, Qunspecified))
+                ;
+              else if (EQ (keyword, QCfamily))
                 {
                   if (STRINGP (value))
                     to[LFACE_FAMILY_INDEX] = value;