Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 670-674)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 209-210)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185

18 files changed, 267 insertions, 79 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2c241cd2a51..9cc5e085001 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,96 @@
+2007-03-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * Makefile.in (alloca.o, gtkutil.o): Depend on systime.h.
+        (dired.o, editfns.o, fileio.o, msdos.o): Depend on atimer.h.
+        (dosfns.o, window.o, fns.o, macselect.o): Depend on atimer.h and
+        systime.h.
+        (term.o, print.o, lread.o): Depend on blockinput.h, atimer.h, and
+        systime.h.
+        (macfns.o): Remove duplicate dependency on systime.h.
+
+        * dispnew.c (Fopen_termscript): Add BLOCK_INPUT around fclose.
+        (Fsend_string_to_terminal): Add BLOCK_INPUT around fwrite.
+
+        * fileio.c (do_auto_save_unwind): Add BLOCK_INPUT around fclose.
+        (Fdo_auto_save): Add BLOCK_INPUT around fwrite.
+
+        * keyboard.c (record_char): Add BLOCK_INPUT around fwrite.
+        (Fopen_dribble_file): Add BLOCK_INPUT around fclose.
+
+        * lread.c: Include blockinput.h.
+        (readchar, Fget_file_char): Add BLOCK_INPUT around getc.
+        (unreadchar): Add BLOCK_INPUT around ungetc.
+        (load_unwind): Add BLOCK_INPUT around fclose.
+
+        * print.c: Include blockinput.h.
+        (Fredirect_debugging_output): Add BLOCK_INPUT around fclose.
+
+        * process.c (Fmake_network_process) [HAVE_GETADDRINFO]: Clear
+        immediate_quit before calling freeaddrinfo.  Add BLOCK_INPUT
+        around freeaddrinfo.
+
+        * term.c: Include blockinput.h.
+        (write_glyphs, insert_glyphs): Add BLOCK_INPUT around fwrite.
+
+2007-03-19  Richard Stallman  <rms@gnu.org>
+
+        * keyboard.c (NUM_RECENT_KEYS): Bump up to 300.
+
+        * buffer.c (syms_of_buffer): Doc fix.
+
+2007-03-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (pbm_load): Signal error for invalid image size.
+
+2007-03-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (note_mouse_movement): Don't return immediately for
+        LeaveNotify case.
+
+        * macmenu.c (popup_activated_flag): New variable.
+        (x_activate_menubar, mac_menu_show): Set it during menu tracking.
+        (popup_activated): New function.
+
+        * xdisp.c (redisplay_internal, note_mouse_highlight): Check
+        popup_activated for MAC_OS.
+
+2007-03-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * buffer.c (syms_of_buffer) <buffer-display-table>: Doc fix.
+        Reported by Nikolaj Schumacher <n_schumacher@web.de>.
+
+2007-03-17  Richard Stallman  <rms@gnu.org>
+
+        * dired.c (file_name_completion): gcpro NAME.
+
+2007-03-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (try_window_id): Increment matrix positions if the
+        buffer's byte count has increased, but not the character count.
+
+2007-03-12  Andreas Schwab  <schwab@suse.de>
+
+        * lisp.h: Declare check_obarray.
+
+        * process.c (Fdelete_process): Properly handle deletion of first
+        element of deleted_pid_list.
+        (create_process): Declare pid as pid_t.
+
+2007-03-12  Kim F. Storm  <storm@cua.dk>
+
+        * process.c (sigchld_handler): Change type of pid to pid_t.
+        Scan deleted_pid_list explicitly to avoid using Fmember which don't
+        know about mark bits and make_fixnum_or_float which may malloc.
+        Reported by Andreas Schwab.
+
+        * keyboard.c (read_key_sequence): Store original event into keybuf
+        when replaying sequence with local keymap(s) from string.
+
+2007-03-12  Glenn Morris  <rgm@gnu.org>
+
+        * editfns.c (Fdecode_time, Fencode_time): Doc fix ("daylight
+        savings" to "daylight saving").
+
 2007-03-11  Sam Steingold  <sds@gnu.org>
 
         * process.c (sigchld_handler): Sleep before wait3 to avoid a busyloop.
@@ -8,8 +101,8 @@
 
 2007-03-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * macterm.c [USE_CARBON_EVENTS] (mac_handle_mouse_event): Ignore
-        mouse wheel movement on title bar or tool bar.
+        * macterm.c [USE_CARBON_EVENTS] (mac_handle_mouse_event):
+        Ignore mouse wheel movement on title bar or tool bar.
 
 2007-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 343eec689a2..d6e1dff4e32 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -5706,7 +5706,7 @@
         HAVE_TIMEVAL is defined and NEED_TIME_H isn't.
 
         * systime.h: Note that the tz_dsttime field of the struct timezone
-        returned by gettimeofday doesn't say whether daylight savings is
+        returned by gettimeofday doesn't say whether daylight saving is
         _currently- active; rather it specifies whether it is *ever*
         active.
         (EMACS_GET_TZ_OFFSET_AND_SAVINGS): Removed `savings_flag'
diff --git a/src/Makefile.in b/src/Makefile.in
index ada18576e3d..f62bb8c2b26 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1092,7 +1092,7 @@ stamp-oldxmenu:
    They should define HAVE_ALLOCA.
    Some use the C version in alloca.c (these define C_ALLOCA in config.h).
    */
-alloca.o: alloca.c blockinput.h atimer.h
+alloca.o: alloca.c blockinput.h atimer.h systime.h
 
 /* Nearly all the following files depend on lisp.h,
    but it is not included as a dependency because
@@ -1130,7 +1130,7 @@ pre-crt0.o: pre-crt0.c
 ecrt0.o: ecrt0.c $(config_h)
         CRT0_COMPILE ${srcdir}/ecrt0.c
 dired.o: dired.c commands.h buffer.h $(config_h) character.h charset.h \
-   coding.h regex.h systime.h blockinput.h
+   coding.h regex.h systime.h blockinput.h atimer.h
 dispnew.o: dispnew.c  systty.h systime.h commands.h process.h frame.h \
    window.h buffer.h dispextern.h termchar.h termopts.h termhooks.h cm.h \
    disptab.h indent.h intervals.h \
@@ -1139,14 +1139,15 @@ dispnew.o: dispnew.c  systty.h systime.h commands.h process.h frame.h \
 doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h keymap.h character.h
 doprnt.o: doprnt.c character.h $(config_h)
 dosfns.o: buffer.h termchar.h termhooks.h frame.h blockinput.h window.h \
-   msdos.h dosfns.h dispextern.h charset.h coding.h $(config_h)
+   msdos.h dosfns.h dispextern.h charset.h coding.h atimer.h systime.h \
+   $(config_h)
 editfns.o: editfns.c window.h buffer.h systime.h $(INTERVAL_SRC) character.h \
-   coding.h dispextern.h frame.h blockinput.h $(config_h)
+   coding.h dispextern.h frame.h blockinput.h atimer.h $(config_h)
 emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \
    termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h) \
    window.h dispextern.h keyboard.h keymap.h
 fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) character.h \
-   coding.h msdos.h dispextern.h blockinput.h $(config_h)
+   coding.h msdos.h dispextern.h blockinput.h atimer.h $(config_h)
 filelock.o: filelock.c buffer.h character.h charset.h coding.h systime.h \
    epaths.h $(config_h)
 filemode.o: filemode.c  $(config_h)
@@ -1188,7 +1189,7 @@ minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \
 mktime.o: mktime.c $(config_h)
 msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
    termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \
-   keyboard.h intervals.h buffer.h commands.h blockinput.h $(config_h)
+   keyboard.h intervals.h buffer.h commands.h blockinput.h atimer.h $(config_h)
 process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \
    commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \
    blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \
@@ -1210,7 +1211,7 @@ sysdep.o: sysdep.c syssignal.h systty.h systime.h syswait.h blockinput.h \
    frame.h atimer.h window.h msdos.h dosfns.h keyboard.h  $(config_h)
 term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \
    disptab.h dispextern.h keyboard.h character.h charset.h coding.h ccl.h \
-   msdos.h window.h keymap.h
+   msdos.h window.h keymap.h blockinput.h atimer.h systime.h
 termcap.o: termcap.c $(config_h)
 terminfo.o: terminfo.c $(config_h)
 tparam.o: tparam.c $(config_h)
@@ -1225,15 +1226,16 @@ widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \
    $(srcdir)/../lwlib/lwlib.h $(config_h)
 window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
    termhooks.h disptab.h keyboard.h dispextern.h msdos.h composite.h \
-   keymap.h blockinput.h $(INTERVAL_SRC) xterm.h w32term.h macterm.h $(config_h)
+   keymap.h blockinput.h atimer.h systime.h $(INTERVAL_SRC) \
+   xterm.h w32term.h macterm.h $(config_h)
 xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \
    coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h     \
-   charset.h keyboard.h $(INTERVAL_SRC) region-cache.h xterm.h w32term.h      \
-   macterm.h $(config_h) msdos.h composite.h fontset.h blockinput.h atimer.h  \
+   charset.h $(config_h) keyboard.h $(INTERVAL_SRC) region-cache.h xterm.h    \
+   w32term.h macterm.h msdos.h composite.h fontset.h blockinput.h atimer.h    \
    systime.h keymap.h $(FONTSRC)
 xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h   \
    window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \
-   systime.h keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC) \
+   systime.h keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC)   \
    $(FONTSRC) $(config_h)
 xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \
    $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \
@@ -1258,7 +1260,8 @@ xrdb.o: xrdb.c $(config_h) epaths.h
 xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \
   lisp.h termopts.h
 gtkutil.o:  gtkutil.c gtkutil.h xterm.h lisp.h frame.h $(config_h) \
-  blockinput.h window.h atimer.h termhooks.h keyboard.h charset.h coding.h
+  blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \
+  charset.h coding.h
 
 hftctl.o: hftctl.c $(config_h)
 sound.o: sound.c dispextern.h $(config_h)
@@ -1278,11 +1281,13 @@ eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h \
 floatfns.o: floatfns.c $(config_h)
 fns.o: fns.c commands.h $(config_h) frame.h buffer.h character.h keyboard.h \
  keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \
- blockinput.h xterm.h
+ blockinput.h atimer.h systime.h xterm.h
 print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \
-   $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h
+   $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h  \
+   blockinput.h atimer.h systime.h
 lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \
- charset.h $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h
+ charset.h $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h \
+ blockinput.h atimer.h systime.h
 
 /* Text properties support */
 textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVAL_SRC) \
@@ -1306,14 +1311,15 @@ mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h charset.h \
   coding.h ccl.h $(config_h)
 macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \
   dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \
-  atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h)
+  atimer.h systime.h epaths.h termhooks.h coding.h $(config_h)
 macmenu.o: macmenu.c termhooks.h frame.h window.h dispextern.h macgui.h \
   keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h)
 macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \
   frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \
   termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \
   process.h coding.h $(config_h)
-macselect.o: blockinput.h macterm.h macgui.h frame.h keymap.h $(config_h)
+macselect.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \
+  keymap.h $(config_h)
 
 ${emacsapp}Contents/Resources/English.lproj:
         mkdir -p $@
diff --git a/src/buffer.c b/src/buffer.c
index a86edc4f430..f8d5bdc76fe 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5698,8 +5698,8 @@ characters or nil.  The value nil means display the character in the
 default fashion; otherwise, the characters from the vector are delivered
 to the screen instead of the original character.
 
-For example, (aset buffer-display-table ?X ?Y) will cause Emacs to display
-a capital Y instead of each X character.
+For example, (aset buffer-display-table ?X [?Y]) tells Emacs
+to display a capital Y instead of each X character.
 
 In addition, a char-table has six extra slots to control the display of:
 
diff --git a/src/dired.c b/src/dired.c
index 27f9f953eb6..a576c9d4c17 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -671,8 +671,15 @@ file_name_completion (file, dirname, all_flag, ver_flag, predicate)
           if (!NILP (predicate))
             {
               Lisp_Object decoded;
+              Lisp_Object val;
+              struct gcpro gcpro1;
+
+              GCPRO1 (name);
               decoded = Fexpand_file_name (DECODE_FILE (name), dirname);
-              if (NILP (call1 (predicate, decoded)))
+              val = call1 (predicate, decoded);
+              UNGCPRO;
+
+              if (NILP (val))
                 continue;
             }
 
@@ -695,7 +702,7 @@ file_name_completion (file, dirname, all_flag, ver_flag, predicate)
               compare = min (bestmatchsize, len);
               p1 = SDATA (bestmatch);
               p2 = (unsigned char *) dp->d_name;
-              matchsize = scmp(p1, p2, compare);
+              matchsize = scmp (p1, p2, compare);
               if (matchsize < 0)
                 matchsize = compare;
               if (completion_ignore_case)
diff --git a/src/dispnew.c b/src/dispnew.c
index 97cd210396c..313221f43f5 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6360,7 +6360,12 @@ FILE = nil means just close any termscript file currently open.  */)
      (file)
      Lisp_Object file;
 {
-  if (termscript != 0) fclose (termscript);
+  if (termscript != 0)
+    {
+      BLOCK_INPUT;
+      fclose (termscript);
+      UNBLOCK_INPUT;
+    }
   termscript = 0;
 
   if (! NILP (file))
@@ -6383,6 +6388,7 @@ Control characters in STRING will have terminal-dependent effects.  */)
 {
   /* ??? Perhaps we should do something special for multibyte strings here.  */
   CHECK_STRING (string);
+  BLOCK_INPUT;
   fwrite (SDATA (string), 1, SBYTES (string), stdout);
   fflush (stdout);
   if (termscript)
@@ -6391,6 +6397,7 @@ Control characters in STRING will have terminal-dependent effects.  */)
               termscript);
       fflush (termscript);
     }
+  UNBLOCK_INPUT;
   return Qnil;
 }
 
diff --git a/src/editfns.c b/src/editfns.c
index 70cfac36fb1..d2cd31044ce 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1727,7 +1727,7 @@ support.  MINUTE is an integer between 0 and 59.  HOUR is an integer
 between 0 and 23.  DAY is an integer between 1 and 31.  MONTH is an
 integer between 1 and 12.  YEAR is an integer indicating the
 four-digit year.  DOW is the day of week, an integer between 0 and 6,
-where 0 is Sunday.  DST is t if daylight savings time is effect,
+where 0 is Sunday.  DST is t if daylight saving time is in effect,
 otherwise nil.  ZONE is an integer indicating the number of seconds
 east of Greenwich.  (Note that Common Lisp has different meanings for
 DOW and ZONE.)  */)
@@ -1776,7 +1776,7 @@ This is the reverse operation of `decode-time', which see.
 ZONE defaults to the current time zone rule.  This can
 be a string or t (as from `set-time-zone-rule'), or it can be a list
 \(as from `current-time-zone') or an integer (as from `decode-time')
-applied without consideration for daylight savings time.
+applied without consideration for daylight saving time.
 
 You can pass more than 7 arguments; then the first six arguments
 are used as SECOND through YEAR, and the *last* argument is used as ZONE.
diff --git a/src/fileio.c b/src/fileio.c
index c6589e989ec..892457603aa 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5720,7 +5720,11 @@ do_auto_save_unwind (arg)  /* used as unwind-protect function */
   FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer;
   auto_saving = 0;
   if (stream != NULL)
-    fclose (stream);
+    {
+      BLOCK_INPUT;
+      fclose (stream);
+      UNBLOCK_INPUT;
+    }
   return Qnil;
 }
 
@@ -5850,6 +5854,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer.  */)
         if (STRINGP (b->auto_save_file_name)
             && stream != NULL && do_handled_files == 0)
           {
+            BLOCK_INPUT;
             if (!NILP (b->filename))
               {
                 fwrite (SDATA (b->filename), 1,
@@ -5859,6 +5864,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer.  */)
             fwrite (SDATA (b->auto_save_file_name), 1,
                     SBYTES (b->auto_save_file_name), stream);
             putc ('\n', stream);
+            UNBLOCK_INPUT;
           }
 
         if (!NILP (current_only)
diff --git a/src/image.c b/src/image.c
index c58e0d4695e..b8317b1e982 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5742,6 +5742,14 @@ pbm_load (f, img)
     }
   else
     {
+      if (raw_p && (p + 3 * height * width > end))
+        {
+          x_destroy_x_image (ximg);
+          image_error ("Invalid image size in image `%s'",
+                       img->spec, Qnil);
+          goto error;
+        }
+
       for (y = 0; y < height; ++y)
         for (x = 0; x < width; ++x)
           {
diff --git a/src/keyboard.c b/src/keyboard.c
index e1e53010931..69199dd436c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -142,10 +142,10 @@ KBOARD the_only_kboard;
    do not execute it; call disabled-command-function's value instead.  */
 Lisp_Object Qdisabled, Qdisabled_command_function;
 
-#define NUM_RECENT_KEYS (100)
+#define NUM_RECENT_KEYS (300)
 int recent_keys_index;  /* Index for storing next element into recent_keys */
 int total_keys;         /* Total number of elements stored into recent_keys */
-Lisp_Object recent_keys; /* A vector, holding the last 100 keystrokes */
+Lisp_Object recent_keys; /* Vector holds the last NUM_RECENT_KEYS keystrokes */
 
 /* Vector holding the key sequence that invoked the current command.
    It is reused for each command, and it may be longer than the current
@@ -3525,6 +3525,7 @@ record_char (c)
      If you, dear reader, have a better idea, you've got the source.  :-) */
   if (dribble)
     {
+      BLOCK_INPUT;
       if (INTEGERP (c))
         {
           if (XUINT (c) < 0x100)
@@ -3550,6 +3551,7 @@ record_char (c)
         }
 
       fflush (dribble);
+      UNBLOCK_INPUT;
     }
 }
 
@@ -9403,6 +9405,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                       if (!NILP (map) || !NILP (map2))
                         {
                           from_string = string;
+                          keybuf[t++] = key;
+                          mock_input = t;
                           goto replay_sequence;
                         }
                     }
@@ -10289,7 +10293,7 @@ if there is a doubt, the value is t.  */)
 }
 
 DEFUN ("recent-keys", Frecent_keys, Srecent_keys, 0, 0, 0,
-       doc: /* Return vector of last 100 events, not counting those from keyboard macros.  */)
+       doc: /* Return vector of last 300 events, not counting those from keyboard macros.  */)
      ()
 {
   Lisp_Object *keys = XVECTOR (recent_keys)->contents;
@@ -10433,7 +10437,9 @@ If FILE is nil, close any open dribble file.  */)
 {
   if (dribble)
     {
+      BLOCK_INPUT;
       fclose (dribble);
+      UNBLOCK_INPUT;
       dribble = 0;
     }
   if (!NILP (file))
diff --git a/src/lisp.h b/src/lisp.h
index 04c1bb91642..6ba01b1e8f8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2686,6 +2686,7 @@ EXFUN (Fread_char, 3);
 EXFUN (Fread_event, 3);
 extern Lisp_Object read_filtered_event P_ ((int, int, int, int, Lisp_Object));
 EXFUN (Feval_region, 4);
+extern Lisp_Object check_obarray P_ ((Lisp_Object));
 extern Lisp_Object intern P_ ((const char *));
 extern Lisp_Object make_symbol P_ ((char *));
 extern Lisp_Object oblookup P_ ((Lisp_Object, const char *, int, int));
diff --git a/src/lread.c b/src/lread.c
index 78b59340855..178b381af10 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -38,6 +38,7 @@ Boston, MA 02110-1301, USA.  */
 #include "keyboard.h"
 #include "termhooks.h"
 #include "coding.h"
+#include "blockinput.h"
 
 #ifdef lint
 #include <sys/inode.h>
@@ -461,7 +462,11 @@ unreadchar (readcharfun, c)
            || EQ (readcharfun, Qget_emacs_mule_file_char))
     {
       if (load_each_byte)
-        ungetc (c, instream);
+        {
+          BLOCK_INPUT;
+          ungetc (c, instream);
+          UNBLOCK_INPUT;
+        }
       else
         unread_char = c;
     }
@@ -485,20 +490,28 @@ readbyte_from_file (c, readcharfun)
 {
   if (c >= 0)
     {
+      BLOCK_INPUT;
       ungetc (c, instream);
+      UNBLOCK_INPUT;
       return 0;
     }
 
+  BLOCK_INPUT;
   c = getc (instream);
+  UNBLOCK_INPUT;
+
 #ifdef EINTR
-      /* Interrupted reads have been observed while reading over the network */
-      while (c == EOF && ferror (instream) && errno == EINTR)
-        {
-          QUIT;
-          clearerr (instream);
-          c = getc (instream);
-        }
+  /* Interrupted reads have been observed while reading over the network */
+  while (c == EOF && ferror (instream) && errno == EINTR)
+    {
+      QUIT;
+      clearerr (instream);
+      BLOCK_INPUT;
+      c = getc (instream);
+      UNBLOCK_INPUT;
+    }
 #endif
+
   return (c == EOF ? -1 : c);
 }
 
@@ -800,7 +813,9 @@ DEFUN ("get-file-char", Fget_file_char, Sget_file_char, 0, 0, 0,
      ()
 {
   register Lisp_Object val;
+  BLOCK_INPUT;
   XSETINT (val, getc (instream));
+  UNBLOCK_INPUT;
   return val;
 }
 
@@ -1237,7 +1252,11 @@ load_unwind (arg)  /* used as unwind-protect function in load */
 {
   FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer;
   if (stream != NULL)
-    fclose (stream);
+    {
+      BLOCK_INPUT;
+      fclose (stream);
+      UNBLOCK_INPUT;
+    }
   if (--load_in_progress < 0) load_in_progress = 0;
   return Qnil;
 }
diff --git a/src/macmenu.c b/src/macmenu.c
index 82322515c31..c7a84df7106 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -259,6 +259,9 @@ static int menu_items_n_panes;
 /* Current depth within submenus.  */
 static int menu_items_submenu_depth;
 
+/* Nonzero means a menu is currently active.  */
+static int popup_activated_flag;
+
 /* This is set nonzero after the user activates the menu bar, and set
    to zero again after the menu bars are redisplayed by prepare_menu_bar.
    While it is nonzero, all calls to set_frame_menubar go deep.
@@ -1141,7 +1144,9 @@ x_activate_menubar (f)
   set_frame_menubar (f, 0, 1);
   BLOCK_INPUT;
 
+  popup_activated_flag = 1;
   menu_choice = MenuSelect (saved_menu_event_location);
+  popup_activated_flag = 0;
   menu_id = HiWord (menu_choice);
   menu_item = LoWord (menu_choice);
 
@@ -2237,7 +2242,9 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   install_menu_quit_handler (MAC_MENU_POPUP_SUB, menu);
 
   /* Display the menu.  */
+  popup_activated_flag = 1;
   menu_item_choice = PopUpMenuSelect (menu, pos.v, pos.h, 0);
+  popup_activated_flag = 0;
 
   /* Get the refcon to find the correct item */
   if (menu_item_choice)
@@ -3218,6 +3225,14 @@ dispose_menus (kind, id)
 
 #endif /* HAVE_MENUS */
 
+/* Detect if a menu is currently active.  */
+
+int
+popup_activated ()
+{
+  return popup_activated_flag;
+}
+
 /* The following is used by delayed window autoselection.  */
 
 DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0,
diff --git a/src/macterm.c b/src/macterm.c
index 1fa3daace6f..3d122215fb3 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4486,25 +4486,24 @@ note_mouse_movement (frame, pos)
   last_mouse_motion_position = *pos;
   XSETFRAME (last_mouse_motion_frame, frame);
 
+  if (frame == dpyinfo->mouse_face_mouse_frame
 #if TARGET_API_MAC_CARBON
-  if (!PtInRect (*pos, GetWindowPortBounds (FRAME_MAC_WINDOW (frame), &r)))
+      && !PtInRect (*pos, GetWindowPortBounds (FRAME_MAC_WINDOW (frame), &r))
 #else
-  if (!PtInRect (*pos, &FRAME_MAC_WINDOW (frame)->portRect))
+      && !PtInRect (*pos, &FRAME_MAC_WINDOW (frame)->portRect)
 #endif
+      )
     {
-      if (frame == dpyinfo->mouse_face_mouse_frame)
-        /* This case corresponds to LeaveNotify in X11.  */
-        {
-          /* If we move outside the frame, then we're certainly no
-             longer on any text in the frame.  */
-          clear_mouse_face (dpyinfo);
-          dpyinfo->mouse_face_mouse_frame = 0;
-          if (!dpyinfo->grabbed)
-            rif->define_frame_cursor (frame,
-                                      frame->output_data.mac->nontext_cursor);
-        }
-      return 1;
+      /* This case corresponds to LeaveNotify in X11.  If we move
+         outside the frame, then we're certainly no longer on any text
+         in the frame.  */
+      clear_mouse_face (dpyinfo);
+      dpyinfo->mouse_face_mouse_frame = 0;
+      if (!dpyinfo->grabbed)
+        rif->define_frame_cursor (frame,
+                                  frame->output_data.mac->nontext_cursor);
     }
+
   /* Has the mouse moved off the glyph it was on at the last sighting?  */
   if (frame != last_mouse_glyph_frame
       || !PtInRect (*pos, &last_mouse_glyph))
diff --git a/src/print.c b/src/print.c
index 709945494e3..eb549fd18c0 100644
--- a/src/print.c
+++ b/src/print.c
@@ -34,6 +34,7 @@ Boston, MA 02110-1301, USA.  */
 #include "dispextern.h"
 #include "termchar.h"
 #include "intervals.h"
+#include "blockinput.h"
 
 Lisp_Object Vstandard_output, Qstandard_output;
 
@@ -976,7 +977,11 @@ append to existing target file.  */)
      Lisp_Object file, append;
 {
   if (initial_stderr_stream != NULL)
-    fclose (stderr);
+    {
+      BLOCK_INPUT;
+      fclose (stderr);
+      UNBLOCK_INPUT;
+    }
   stderr = initial_stderr_stream;
   initial_stderr_stream = NULL;
 
diff --git a/src/process.c b/src/process.c
index f3162c9d3e5..ad637ad6cfa 100644
--- a/src/process.c
+++ b/src/process.c
@@ -816,7 +816,7 @@ nil, indicating the current buffer's process.  */)
       Lisp_Object symbol;
       /* Assignment to EMACS_INT stops GCC whining about limited range
          of data type.  */
-      EMACS_INT pid = p->pid;;
+      EMACS_INT pid = p->pid;
 
       /* No problem storing the pid here, as it is still in Vprocess_alist.  */
       deleted_pid_list = Fcons (make_fixnum_or_float (pid),
@@ -829,7 +829,8 @@ nil, indicating the current buffer's process.  */)
       if (CONSP (p->status))
         symbol = XCAR (p->status);
       if (EQ (symbol, Qsignal) || EQ (symbol, Qexit))
-        Fdelete (make_fixnum_or_float (pid), deleted_pid_list);
+        deleted_pid_list
+          = Fdelete (make_fixnum_or_float (pid), deleted_pid_list);
       else
 #endif
         {
@@ -1817,7 +1818,8 @@ create_process (process, new_argv, current_dir)
      char **new_argv;
      Lisp_Object current_dir;
 {
-  int pid, inchannel, outchannel;
+  int inchannel, outchannel;
+  pid_t pid;
   int sv[2];
 #ifdef POSIX_SIGNALS
   sigset_t procmask;
@@ -3333,13 +3335,17 @@ usage: (make-network-process &rest ARGS)  */)
 #endif
     }
 
+  immediate_quit = 0;
+
 #ifdef HAVE_GETADDRINFO
   if (res != &ai)
-    freeaddrinfo (res);
+    {
+      BLOCK_INPUT;
+      freeaddrinfo (res);
+      UNBLOCK_INPUT;
+    }
 #endif
 
-  immediate_quit = 0;
-
   /* Discard the unwind protect for closing S, if any.  */
   specpdl_ptr = specpdl + count1;
 
@@ -6392,7 +6398,7 @@ sigchld_handler (signo)
 
   while (1)
     {
-      register EMACS_INT pid;
+      pid_t pid;
       WAITTYPE w;
       Lisp_Object tail;
 
@@ -6401,16 +6407,17 @@ sigchld_handler (signo)
 #define WUNTRACED 0
 #endif /* no WUNTRACED */
       /* Keep trying to get a status until we get a definitive result.  */
-      while (1) {
-        errno = 0;
-        pid = wait3 (&w, WNOHANG | WUNTRACED, 0);
-        if (! (pid < 0 && errno == EINTR))
-          break;
-        /* avoid a busyloop: wait3 is a system call, so we do not want
-           to prevent the kernel from actually sending SIGCHLD to emacs
-           by asking for it all the time */
-        sleep (1);
-      }
+      while (1)
+        {
+          errno = 0;
+          pid = wait3 (&w, WNOHANG | WUNTRACED, 0);
+          if (! (pid < 0 && errno == EINTR))
+            break;
+          /* Avoid a busyloop: wait3 is a system call, so we do not want
+             to prevent the kernel from actually sending SIGCHLD to emacs
+             by asking for it all the time.  */
+          sleep (1);
+        }
 
       if (pid <= 0)
         {
@@ -6436,11 +6443,15 @@ sigchld_handler (signo)
       /* Find the process that signaled us, and record its status.  */
 
       /* The process can have been deleted by Fdelete_process.  */
-      tail = Fmember (make_fixnum_or_float (pid), deleted_pid_list);
-      if (!NILP (tail))
+      for (tail = deleted_pid_list; GC_CONSP (tail); tail = XCDR (tail))
         {
-          Fsetcar (tail, Qnil);
-          goto sigchld_end_of_loop;
+          Lisp_Object xpid = XCAR (tail);
+          if ((GC_INTEGERP (xpid) && pid == (pid_t) XINT (xpid))
+              || (GC_FLOATP (xpid) && pid == (pid_t) XFLOAT_DATA (xpid)))
+            {
+              XSETCAR (tail, Qnil);
+              goto sigchld_end_of_loop;
+            }
         }
 
       /* Otherwise, if it is asynchronous, it is in Vprocess_alist.  */
diff --git a/src/term.c b/src/term.c
index 1ec904e79f3..1fcda1abb77 100644
--- a/src/term.c
+++ b/src/term.c
@@ -41,6 +41,7 @@ Boston, MA 02110-1301, USA.  */
 #include "dispextern.h"
 #include "window.h"
 #include "keymap.h"
+#include "blockinput.h"
 
 /* For now, don't try to include termcap.h.  On some systems,
    configure finds a non-standard termcap.h that the main build
@@ -1057,11 +1058,13 @@ write_glyphs (string, len)
       conversion_buffer = encode_terminal_code (string, n, coding);
       if (coding->produced > 0)
         {
+          BLOCK_INPUT;
           fwrite (conversion_buffer, 1, coding->produced, stdout);
           if (ferror (stdout))
             clearerr (stdout);
           if (termscript)
             fwrite (conversion_buffer, 1, coding->produced, termscript);
+          UNBLOCK_INPUT;
         }
       len -= n;
       string += n;
@@ -1156,11 +1159,13 @@ insert_glyphs (start, len)
 
       if (coding->produced > 0)
         {
+          BLOCK_INPUT;
           fwrite (conversion_buffer, 1, coding->produced, stdout);
           if (ferror (stdout))
             clearerr (stdout);
           if (termscript)
             fwrite (conversion_buffer, 1, coding->produced, termscript);
+          UNBLOCK_INPUT;
         }
 
       OUTPUT1_IF (TS_pad_inserted_char);
diff --git a/src/xdisp.c b/src/xdisp.c
index ee17abb7794..8f1c3a6c241 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11032,7 +11032,7 @@ redisplay_internal (preserve_echo_area)
         return;
     }
 
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (MAC_OS)
   if (popup_activated ())
     return;
 #endif
@@ -15047,7 +15047,7 @@ try_window_id (w)
     sync_frame_with_window_matrix_rows (w);
 
   /* Adjust buffer positions in reused rows.  */
-  if (delta)
+  if (delta || delta_bytes)
     increment_matrix_positions (current_matrix,
                                 first_unchanged_at_end_vpos + dvpos,
                                 bottom_vpos, delta, delta_bytes);
@@ -22977,7 +22977,7 @@ note_mouse_highlight (f, x, y)
   struct buffer *b;
 
   /* When a menu is active, don't highlight because this looks odd.  */
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (MAC_OS)
   if (popup_activated ())
     return;
 #endif