Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-660
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-661
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-662
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-663
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-664
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-665
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-666
   Fix read-only prompt problem in isearch

 * emacs@sv.gnu.org/emacs--devo--0--patch-667
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-668
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-669
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-670
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-671
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-672
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-673
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-206
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-207
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-208
   Update from CVS

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

26 files changed, 471 insertions, 147 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d9633301be2..76414a593f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,183 @@
-2007-03-02  Stuart D. Herring <herring@lanl.gov>
+2007-03-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * keymap.c (Fkey_binding): Don't consider two-element lists as
-        events.
+        * 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.
+
+2007-03-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (Fx_server_vendor): Change vendor string to "Apple Inc.".
+
+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.
+
+2007-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keyboard.c (help_form_saved_window_configs): New var.
+        (read_char_help_form_unwind): New function.
+        (read_char): Don't restore window configuration if a mouse click
+        arrives while the help form is being displayed.
+
+2007-03-10  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (redisplay_window): Don't automatically select a new window
+        start for a contination line during mouse-click.
+
+2007-03-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (handle_one_xevent): Ignore buttons > 3 for the tool bar.
+
+2007-03-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * keymap.c (Fdescribe_buffer_bindings): Check that BUFFER is valid.
+
+2007-03-08  Richard Stallman  <rms@gnu.org>
+
+        * keyboard.c (syms_of_keyboard): Doc fix.
+
+2007-03-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * minibuf.c (Ftry_completion): Don't short circuit if
+        completion-ignore-case is non-nil.
+
+2007-03-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (mac_set_scroll_bar_width, mac_frame_parm_handlers):
+        Undo 2006-03-06 changes.
+
+        * macterm.c (XTset_vertical_scroll_bar) [MAC_OSX]: Don't show scroll
+        bar if its width is smaller than that of Aqua small scroll bar.
+
+2007-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf.c (read_minibuf): Bind inhibit-read-only a bit longer so as
+        to handle correctly prompts with read-only property.
+
+2007-03-06  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * sound.c (wav_play): Check header->data_length to see how much we
+        shall read.
+        (alsa_period_size): Convert ALSA period size in frames to bytes.
+        (alsa_write): Return if frames is zero.
+
+2007-03-06  Kenichi Handa  <handa@m17n.org>
+
+        * xselect.c (Vselection_coding_system): Documentation improved.
+
+2007-03-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (x_scroll_bar_create, XTread_socket): Replace #if
+        USE_TOOLKIT_SCROLL_BARS with #ifdef USE_TOOLKIT_SCROLL_BARS.
+        (x_set_window_size): Call SET_FRAME_GARBAGED.  Clear window if
+        internal border width has changed.
+
+        * macterm.h (struct mac_output): New member `internal_border_width'.
+
+2007-03-04  Richard Stallman  <rms@gnu.org>
+
+        * window.c (Fdisplay_buffer): Doc fix.
+
+2007-03-03  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in: Don't clear out LIB_X11_LIB, since XFT_LIBS does
+        not include -lX11 on Solaris.
+
+2007-03-02  Stuart D. Herring  <herring@lanl.gov>
+
+        * keymap.c (Fkey_binding): Don't consider one-element lists as events.
 
 2007-03-01  Kenichi Handa  <handa@m17n.org>
 
@@ -30,8 +206,8 @@
         (x_scroll_bar_create, XTset_vertical_scroll_bar)
         [USE_TOOLKIT_SCROLL_BARS]: Initialize bar->min_handle.
 
-        * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: New
-        member `min_handle'.
+        * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
+        New member `min_handle'.
 
 2007-02-23  Kim F. Storm  <storm@cua.dk>
 
@@ -54,11 +230,11 @@
         (mac_flush_display_optional) [USE_CG_DRAWING]: New function.
         (x_redisplay_interface) [USE_CG_DRAWING]: Set it as handler for
         flush_display_optional.
-        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press): New
-        argument MOUSE_POS.  All uses changed.  Set bar->dragging to
+        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press):
+        New argument MOUSE_POS.  All uses changed.  Set bar->dragging to
         negative integer if scroll bar handle is pressed.
-        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release): Negative
-        bar->dragging means scroll bar handle is not dragged.
+        [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release):
+        Negative bar->dragging means scroll bar handle is not dragged.
         [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_drag): Get initial
         offset of scroll bar handle from negative bar->dragging.
         (XTread_socket) [USE_TOOLKIT_SCROLL_BARS]: Modifiers for scroll
@@ -93,8 +269,7 @@
 
         * w32menu.c (current_popup_menu): Make available globally.
         (menubar_selection_callback): Free menu strings before pushing the
-        menu event into the keyboard buffer.  Remove
-        menu_command_in_progress.
+        menu event into the keyboard buffer.  Remove menu_command_in_progress.
 
         * w32fns.c (current_popup_menu): Use from w32menu.c.
         (w32_wnd_proc) [WM_EXITMENULOOP, WM_TIMER]: Use menubar_active
@@ -364,8 +539,8 @@
 
 2007-01-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]: Use
-        DisableControl for disabled items.  Set default button to first
+        * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]:
+        Use DisableControl for disabled items.  Set default button to first
         enabled one.  Use icon of application in execution.
 
 2007-01-13  Eli Zaretskii  <eliz@gnu.org>
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 e19083e3e15..31fc7b5c23e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -403,8 +403,6 @@ LIBXT=$(LIBW)
 #endif /* not USE_X_TOOLKIT */
 
 #if HAVE_XFT
-#undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */
-#define LIB_X11_LIB
 XFT_LIBS=@XFT_LIBS@
 #endif /* HAVE_XFT */
 
@@ -1088,7 +1086,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
@@ -1121,7 +1119,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) charset.h coding.h regex.h \
-   systime.h blockinput.h
+   systime.h blockinput.h atimer.h
 dispnew.o: dispnew.c 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 \
@@ -1130,14 +1128,15 @@ dispnew.o: dispnew.c systime.h commands.h process.h frame.h \
 doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h keymap.h charset.h
 doprnt.o: doprnt.c charset.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) charset.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) charset.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 charset.h coding.h systime.h epaths.h $(config_h)
 filemode.o: filemode.c  $(config_h)
 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
@@ -1176,7 +1175,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 charset.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 \
@@ -1196,7 +1195,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 cm.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 charset.h coding.h ccl.h msdos.h \
-   window.h keymap.h
+   window.h keymap.h blockinput.h atimer.h systime.h
 termcap.o: termcap.c $(config_h)
 terminal.o: terminal.c frame.h termchar.h termhooks.h charset.h coding.h \
    keyboard.h $(config_h)
@@ -1213,7 +1212,8 @@ 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 \
    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 charset.h $(config_h) \
    keyboard.h $(INTERVAL_SRC) region-cache.h xterm.h w32term.h macterm.h \
@@ -1238,7 +1238,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)
@@ -1256,10 +1257,10 @@ 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 charset.h keyboard.h \
  keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \
- blockinput.h xterm.h termhooks.h
+ blockinput.h atimer.h systime.h xterm.h termhooks.h
 print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h \
    $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h \
-   termchar.h
+   blockinput.h atimer.h systime.h
 lread.o: lread.c commands.h keyboard.h buffer.h epaths.h charset.h \
  $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h
 
@@ -1285,14 +1286,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 73e2fb376f7..6e2f097ae88 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5712,8 +5712,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 c542f8019db..ee76fe47be2 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -670,8 +670,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;
             }
 
@@ -694,7 +701,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 4c3a4ca3f02..697773f4daf 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6381,7 +6381,11 @@ FILE = nil means just close any termscript file currently open.  */)
   tty = CURTTY ();
 
   if (tty->termscript != 0)
+  {
+    BLOCK_INPUT;
     fclose (tty->termscript);
+    UNBLOCK_INPUT;
+  }
   tty->termscript = 0;
 
   if (! NILP (file))
@@ -6412,6 +6416,7 @@ currently selected frame.  */)
 
   /* ??? Perhaps we should do something special for multibyte strings here.  */
   CHECK_STRING (string);
+  BLOCK_INPUT;
 
   if (!t)
     error ("Unknown terminal device");
@@ -6425,6 +6430,7 @@ currently selected frame.  */)
     }
   fwrite (SDATA (string), 1, SBYTES (string), tty->output);
   fflush (tty->output);
+  UNBLOCK_INPUT;
   return Qnil;
 }
 
diff --git a/src/editfns.c b/src/editfns.c
index 5053119d0c4..fc99bf977d0 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1729,7 +1729,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.)  */)
@@ -1778,7 +1778,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 074a7a0527c..7cb45a72db7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5806,7 +5806,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;
 }
 
@@ -5936,6 +5940,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,
@@ -5945,6 +5950,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 49d25d819bc..198ffaf4651 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5744,6 +5744,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 82e97441667..686d16a504f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -138,10 +138,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
@@ -2533,6 +2533,17 @@ Lisp_Object print_help ();
 static Lisp_Object kbd_buffer_get_event ();
 static void record_char ();
 
+static Lisp_Object help_form_saved_window_configs;
+static Lisp_Object
+read_char_help_form_unwind (arg)
+{
+  Lisp_Object window_config = XCAR (help_form_saved_window_configs);
+  help_form_saved_window_configs = XCDR (help_form_saved_window_configs);
+  if (!NILP (window_config))
+    Fset_window_configuration (window_config);
+  return Qnil;
+}
+
 #define STOP_POLLING                                    \
 do { if (! polling_stopped_here) stop_polling ();       \
        polling_stopped_here = 1; } while (0)
@@ -3427,8 +3438,10 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
       Lisp_Object tem0;
       count = SPECPDL_INDEX ();
 
-      record_unwind_protect (Fset_window_configuration,
-                             Fcurrent_window_configuration (Qnil));
+      help_form_saved_window_configs
+        = Fcons (Fcurrent_window_configuration (Qnil),
+                 help_form_saved_window_configs);
+      record_unwind_protect (read_char_help_form_unwind, Qnil);
 
       tem0 = Feval (Vhelp_form);
       if (STRINGP (tem0))
@@ -3436,7 +3449,12 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
 
       cancel_echoing ();
       do
-        c = read_char (0, 0, 0, Qnil, 0, NULL);
+        {
+          c = read_char (0, 0, 0, Qnil, 0, NULL);
+          if (EVENT_HAS_PARAMETERS (c)
+              && EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qmouse_click))
+            XSETCAR (help_form_saved_window_configs, Qnil);
+        }
       while (BUFFERP (c));
       /* Remove the help from the frame */
       unbind_to (count, Qnil);
@@ -3615,6 +3633,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)
@@ -3640,6 +3659,7 @@ record_char (c)
         }
 
       fflush (dribble);
+      UNBLOCK_INPUT;
     }
 }
 
@@ -9592,6 +9612,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;
                         }
                     }
@@ -10483,7 +10505,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;
@@ -10627,7 +10649,9 @@ If FILE is nil, close any open dribble file.  */)
 {
   if (dribble)
     {
+      BLOCK_INPUT;
       fclose (dribble);
+      UNBLOCK_INPUT;
       dribble = 0;
     }
   if (!NILP (file))
@@ -11731,6 +11755,9 @@ syms_of_keyboard ()
   menu_bar_items_vector = Qnil;
   staticpro (&menu_bar_items_vector);
 
+  help_form_saved_window_configs = Qnil;
+  staticpro (&help_form_saved_window_configs);
+
   defsubr (&Scurrent_idle_time);
   defsubr (&Sevent_convert_list);
   defsubr (&Sread_key_sequence);
@@ -11797,7 +11824,7 @@ An element of the form (t . EVENT) forces EVENT to be added to that list.  */);
   DEFVAR_LISP ("unread-post-input-method-events", &Vunread_post_input_method_events,
                doc: /* List of events to be processed as input by input methods.
 These events are processed before `unread-command-events'
-and actual keyboard input without given to `input-method-function'.  */);
+and actual keyboard input, but are not given to `input-method-function'.  */);
   Vunread_post_input_method_events = Qnil;
 
   DEFVAR_LISP ("unread-input-method-events", &Vunread_input_method_events,
diff --git a/src/keymap.c b/src/keymap.c
index 0f1e922969c..0aaf9373ba1 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2985,6 +2985,8 @@ Keyboard translations:\n\n\
 You type        Translation\n\
 --------        -----------\n";
 
+  CHECK_BUFFER (buffer);
+
   shadow = Qnil;
   GCPRO1 (shadow);
 
diff --git a/src/lisp.h b/src/lisp.h
index 7a03836021b..8a060b19941 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2649,6 +2649,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 f1671c4543c..cee6cf5a92e 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -38,6 +38,7 @@ Boston, MA 02110-1301, USA.  */
 #include "frame.h"
 #include "termhooks.h"
 #include "coding.h"
+#include "blockinput.h"
 
 #ifdef lint
 #include <sys/inode.h>
@@ -326,14 +327,18 @@ readchar (readcharfun)
 
   if (EQ (readcharfun, Qget_file_char))
     {
+      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);
+          BLOCK_INPUT;
           c = getc (instream);
+          UNBLOCK_INPUT;
         }
 #endif
       return c;
@@ -416,7 +421,11 @@ unreadchar (readcharfun, c)
   else if (EQ (readcharfun, Qlambda))
     read_bytecode_char (1);
   else if (EQ (readcharfun, Qget_file_char))
-    ungetc (c, instream);
+    {
+      BLOCK_INPUT;
+      ungetc (c, instream);
+      UNBLOCK_INPUT;
+    }
   else
     call1 (readcharfun, make_number (c));
 }
@@ -627,7 +636,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;
 }
 
@@ -1046,7 +1057,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/macfns.c b/src/macfns.c
index 9be0d0e9ea5..c05906d6499 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1909,24 +1909,6 @@ x_set_scroll_bar_default_width (f)
 #endif /* not MAC_OSX */
 }
 
-void
-mac_set_scroll_bar_width (f, arg, oldval)
-     struct frame *f;
-     Lisp_Object arg, oldval;
-{
-#ifdef MAC_OSX
-  if (INTEGERP (arg) && XINT (arg) > 0)
-    {
-      if (XINT (arg) < (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH
-                        + MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH) / 2)
-        XSETINT (arg, MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH);
-      else
-        XSETINT (arg, MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH);
-    }
-#endif
-  x_set_scroll_bar_width (f, arg, oldval);
-}
-
 static void
 mac_set_font (f, arg, oldval)
      struct frame *f;
@@ -3052,7 +3034,7 @@ If omitted or nil, that stands for the selected frame's display.  */)
      (display)
      Lisp_Object display;
 {
-  return build_string ("Apple Computers");
+  return build_string ("Apple Inc.");
 }
 
 DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0,
@@ -4677,7 +4659,7 @@ frame_parm_handler mac_frame_parm_handlers[] =
   x_set_menu_bar_lines,
   x_set_mouse_color,
   x_explicitly_set_name,
-  mac_set_scroll_bar_width,
+  x_set_scroll_bar_width,
   x_set_title,
   x_set_unsplittable,
   x_set_vertical_scroll_bars,
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 f4e52a01174..f26c06680bc 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4484,25 +4484,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))
@@ -4963,7 +4962,7 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height)
 #endif
 #if TARGET_API_MAC_CARBON
   ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p",
-#if USE_TOOLKIT_SCROLL_BARS
+#ifdef USE_TOOLKIT_SCROLL_BARS
                    false,
 #else
                    width < disp_height,
@@ -5217,7 +5216,11 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
 #ifdef USE_TOOLKIT_SCROLL_BARS
   if (NILP (bar->track_top))
     {
-      if (sb_width >= disp_height)
+      if (sb_width >= disp_height
+#ifdef MAC_OSX
+          || sb_width < MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH
+#endif
+          )
         {
           XSETINT (bar->track_top, 0);
           XSETINT (bar->track_height, 0);
@@ -6223,6 +6226,16 @@ x_set_window_size (f, change_gravity, cols, rows)
 #endif
     mac_handle_size_change (f, pixelwidth, pixelheight);
 
+  if (f->output_data.mac->internal_border_width
+      != FRAME_INTERNAL_BORDER_WIDTH (f))
+    {
+      mac_clear_window (f);
+      f->output_data.mac->internal_border_width
+        = FRAME_INTERNAL_BORDER_WIDTH (f);
+    }
+
+  SET_FRAME_GARBAGED (f);
+
   UNBLOCK_INPUT;
 }
 
@@ -9974,23 +9987,30 @@ mac_handle_mouse_event (next_handler, event, data)
         if (err != noErr || axis != kEventMouseWheelAxisY)
           break;
 
-        err = GetEventParameter (event, kEventParamMouseWheelDelta,
-                                 typeSInt32, NULL, sizeof (SInt32),
-                                 NULL, &delta);
-        if (err != noErr)
-          break;
         err = GetEventParameter (event, kEventParamMouseLocation,
                                  typeQDPoint, NULL, sizeof (Point),
                                  NULL, &point);
         if (err != noErr)
           break;
+
+        SetPortWindowPort (wp);
+        GlobalToLocal (&point);
+        if (point.h < 0 || point.v < 0
+            || EQ (window_from_coordinates (f, point.h, point.v, 0, 0, 0, 1),
+                   f->tool_bar_window))
+          break;
+
+        err = GetEventParameter (event, kEventParamMouseWheelDelta,
+                                 typeSInt32, NULL, sizeof (SInt32),
+                                 NULL, &delta);
+        if (err != noErr)
+          break;
+
         read_socket_inev->kind = WHEEL_EVENT;
         read_socket_inev->code = 0;
         read_socket_inev->modifiers =
           (mac_event_to_emacs_modifiers (event)
            | ((delta < 0) ? down_modifier : up_modifier));
-        SetPortWindowPort (wp);
-        GlobalToLocal (&point);
         XSETINT (read_socket_inev->x, point.h);
         XSETINT (read_socket_inev->y, point.v);
         XSETFRAME (read_socket_inev->frame_or_window, f);
@@ -11045,7 +11065,7 @@ XTread_socket (sd, expected, hold_quit)
             else
               {
                 /* A window has been deactivated */
-#if USE_TOOLKIT_SCROLL_BARS
+#ifdef USE_TOOLKIT_SCROLL_BARS
                 if (dpyinfo->grabbed && tracked_scroll_bar)
                   {
                     struct input_event event;
diff --git a/src/macterm.h b/src/macterm.h
index 6ee57d60d01..f2d69b7821d 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -327,6 +327,9 @@ struct mac_output
      They are changed only when a different background is involved.  */
   unsigned long relief_background;
 
+  /* Width of the internal border.  */
+  int internal_border_width;
+
   /* Hints for the size and the position of a window.  */
   XSizeHints *size_hints;
 
diff --git a/src/minibuf.c b/src/minibuf.c
index 51a64ffed8b..e3fb8641615 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -702,27 +702,27 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
     specbind (Qinhibit_read_only, Qt);
     specbind (Qinhibit_modification_hooks, Qt);
     Ferase_buffer ();
+
+    if (!NILP (current_buffer->enable_multibyte_characters)
+        && ! STRING_MULTIBYTE (minibuf_prompt))
+      minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);
+    
+    /* Insert the prompt, record where it ends.  */
+    Finsert (1, &minibuf_prompt);
+    if (PT > BEG)
+      {
+        Fput_text_property (make_number (BEG), make_number (PT),
+                            Qfront_sticky, Qt, Qnil);
+        Fput_text_property (make_number (BEG), make_number (PT),
+                            Qrear_nonsticky, Qt, Qnil);
+        Fput_text_property (make_number (BEG), make_number (PT),
+                            Qfield, Qt, Qnil);
+        Fadd_text_properties (make_number (BEG), make_number (PT),
+                              Vminibuffer_prompt_properties, Qnil);
+      }
     unbind_to (count1, Qnil);
   }
 
-  if (!NILP (current_buffer->enable_multibyte_characters)
-      && ! STRING_MULTIBYTE (minibuf_prompt))
-    minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);
-
-  /* Insert the prompt, record where it ends.  */
-  Finsert (1, &minibuf_prompt);
-  if (PT > BEG)
-    {
-      Fput_text_property (make_number (BEG), make_number (PT),
-                          Qfront_sticky, Qt, Qnil);
-      Fput_text_property (make_number (BEG), make_number (PT),
-                          Qrear_nonsticky, Qt, Qnil);
-      Fput_text_property (make_number (BEG), make_number (PT),
-                          Qfield, Qt, Qnil);
-      Fadd_text_properties (make_number (BEG), make_number (PT),
-                            Vminibuffer_prompt_properties, Qnil);
-    }
-
   minibuf_prompt_width = (int) current_column (); /* iftc */
 
   /* Put in the initial input.  */
@@ -1489,6 +1489,10 @@ is used to further constrain the set of candidates.  */)
                 matchcount++;
               bestmatchsize = matchsize;
               if (matchsize <= SCHARS (string)
+                  /* If completion-ignore-case is non-nil, don't
+                     short-circuit because we want to find the best
+                     possible match *including* case differences.  */
+                  && !completion_ignore_case
                   && matchcount > 1)
                 /* No need to look any further.  */
                 break;
diff --git a/src/print.c b/src/print.c
index ed233729c6f..cbf5830a85b 100644
--- a/src/print.c
+++ b/src/print.c
@@ -33,6 +33,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 8b1da4ac5cc..6d84d4c4a87 100644
--- a/src/process.c
+++ b/src/process.c
@@ -817,7 +817,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),
@@ -830,7 +830,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
         {
@@ -1818,7 +1819,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;
@@ -3339,13 +3341,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;
 
@@ -6491,7 +6497,7 @@ sigchld_handler (signo)
 
   while (1)
     {
-      register EMACS_INT pid;
+      pid_t pid;
       WAITTYPE w;
       Lisp_Object tail;
 
@@ -6500,12 +6506,17 @@ sigchld_handler (signo)
 #define WUNTRACED 0
 #endif /* no WUNTRACED */
       /* Keep trying to get a status until we get a definitive result.  */
-      do
+      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 (pid < 0 && errno == EINTR);
 
       if (pid <= 0)
         {
@@ -6531,11 +6542,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/sound.c b/src/sound.c
index 7fb79e64048..5a27e7a6232 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -621,12 +621,18 @@ wav_play (s, sd)
       char *buffer;
       int nbytes;
       int blksize = sd->period_size ? sd->period_size (sd) : 2048;
+      int data_left = header->data_length;
 
       buffer = (char *) alloca (blksize);
       lseek (s->fd, sizeof *header, SEEK_SET);
-
-      while ((nbytes = emacs_read (s->fd, buffer, blksize)) > 0)
-        sd->write (sd, buffer, nbytes);
+      while (data_left > 0
+             && (nbytes = emacs_read (s->fd, buffer, blksize)) > 0)
+        {
+          /* Don't play possible garbage at the end of file */
+          if (data_left < nbytes) nbytes = data_left;
+          data_left -= nbytes;
+          sd->write (sd, buffer, nbytes);
+        }
 
       if (nbytes < 0)
         sound_perror ("Error reading sound file");
@@ -986,7 +992,8 @@ alsa_period_size (sd)
        struct sound_device *sd;
 {
   struct alsa_params *p = (struct alsa_params *) sd->data;
-  return p->period_size;
+  int fact = snd_pcm_format_size (sd->format, 1) * sd->channels;
+  return p->period_size * (fact > 0 ? fact : 1);
 }
 
 static void
@@ -1209,9 +1216,10 @@ alsa_write (sd, buffer, nbytes)
 
   while (nwritten < nbytes)
     {
-      err = snd_pcm_writei (p->handle,
-                            buffer + nwritten,
-                            (nbytes - nwritten)/fact);
+      snd_pcm_uframes_t frames = (nbytes - nwritten)/fact;
+      if (frames == 0) break;
+      
+      err = snd_pcm_writei (p->handle, buffer + nwritten, frames);
       if (err < 0)
         {
           if (err == -EPIPE)
diff --git a/src/term.c b/src/term.c
index a12f982844c..dcbe3f88a16 100644
--- a/src/term.c
+++ b/src/term.c
@@ -47,6 +47,7 @@ Boston, MA 02110-1301, USA.  */
 #include "dispextern.h"
 #include "window.h"
 #include "keymap.h"
+#include "blockinput.h"
 #include "syssignal.h"
 #include "systty.h"
 
@@ -695,11 +696,13 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
       conversion_buffer = encode_terminal_code (string, n, coding);
       if (coding->produced > 0)
         {
+          BLOCK_INPUT;
           fwrite (conversion_buffer, 1, coding->produced, tty->output);
           if (ferror (tty->output))
             clearerr (tty->output);
           if (tty->termscript)
             fwrite (conversion_buffer, 1, coding->produced, tty->termscript);
+          UNBLOCK_INPUT;
         }
       len -= n;
       string += n;
@@ -781,11 +784,13 @@ tty_insert_glyphs (struct frame *f, struct glyph *start, int len)
 
       if (coding->produced > 0)
         {
+          BLOCK_INPUT;
           fwrite (conversion_buffer, 1, coding->produced, tty->output);
           if (ferror (tty->output))
             clearerr (tty->output);
           if (tty->termscript)
             fwrite (conversion_buffer, 1, coding->produced, tty->termscript);
+          UNBLOCK_INPUT;
         }
 
       OUTPUT1_IF (tty, tty->TS_pad_inserted_char);
diff --git a/src/window.c b/src/window.c
index 1554ef7ec3b..94e56d10371 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3614,11 +3614,12 @@ The variables `special-display-buffer-names',
 `same-window-regexps' customize how certain buffer names are handled.
 The latter two take effect only if NOT-THIS-WINDOW is nil.
 
-If optional argument FRAME is `visible', search all visible frames.
-If FRAME is 0, search all visible and iconified frames.
-If FRAME is t, search all frames.
-If FRAME is a frame, search only that frame.
-If FRAME is nil, search only the selected frame
+If optional argument FRAME is `visible', check all visible frames
+for a window to use.
+If FRAME is 0, check all visible and iconified frames.
+If FRAME is t, check all frames.
+If FRAME is a frame, check only that frame.
+If FRAME is nil, check only the selected frame
  (actually the last nonminibuffer frame),
  unless `pop-up-frames' or `display-buffer-reuse-frames' is non-nil,
  which means search visible and iconified frames.
diff --git a/src/xdisp.c b/src/xdisp.c
index 1885735d327..aea7ab515ab 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10876,7 +10876,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
@@ -13143,8 +13143,15 @@ redisplay_window (window, just_this_one_p)
 
       /* If first window line is a continuation line, and window start
          is inside the modified region, but the first change is before
-         current window start, we must select a new window start.*/
+         current window start, we must select a new window start.
+
+         However, if this is the result of a down-mouse event (e.g. by
+         extending the mouse-drag-overlay), we don't want to select a
+         new window start, since that would change the position under
+         the mouse, resulting in an unwanted mouse-movement rather
+         than a simple mouse-click.  */
       if (NILP (w->start_at_line_beg)
+          && NILP (do_mouse_tracking)
           && CHARPOS (startp) > BEGV)
         {
           /* Make sure beg_unchanged and end_unchanged are up to date.
@@ -14903,7 +14910,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);
@@ -22679,7 +22686,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
diff --git a/src/xselect.c b/src/xselect.c
index f34b62c8700..cb00903c41e 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -3007,8 +3007,17 @@ it merely informs you that they have happened.  */);
 
   DEFVAR_LISP ("selection-coding-system", &Vselection_coding_system,
                doc: /* Coding system for communicating with other X clients.
-When sending or receiving text via selection and clipboard, the text is
-encoded or decoded by this coding system.
+
+When sending text via selection and clipboard, if the requested
+data-type is not "UTF8_STRING", the text is encoded by this coding
+system.
+
+When receiving text, if the data-type of the received text is not
+"UTF8_STRING", it is decoded by this coding system.
+
+See also the documentation of the variable `x-select-request-type' how
+to control which data-type to request for receiving text.
+
 The default value is `compound-text-with-extensions'.  */);
   Vselection_coding_system = intern ("compound-text-with-extensions");
 
diff --git a/src/xterm.c b/src/xterm.c
index 5fb04d8103e..6a574533a2c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5292,7 +5292,7 @@ x_scroll_bar_expose (bar, event)
 
   x_scroll_bar_set_handle (bar, XINT (bar->start), XINT (bar->end), 1);
 
-   /* Switch to scroll bar foreground color. */
+  /* Switch to scroll bar foreground color.  */
   if (f->output_data.x->scroll_bar_foreground_pixel != -1)
     XSetForeground (FRAME_X_DISPLAY (f), gc,
                     f->output_data.x->scroll_bar_foreground_pixel);
@@ -6772,15 +6772,16 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
                 int y = event.xbutton.y;
 
                 window = window_from_coordinates (f, x, y, 0, 0, 0, 1);
-                if (EQ (window, f->tool_bar_window))
+                tool_bar_p = EQ (window, f->tool_bar_window);
+
+                if (tool_bar_p && event.xbutton.button < 4)
                   {
-                    if (event.xbutton.type == ButtonPress)
-                      handle_tool_bar_click (f, x, y, 1, 0);
-                    else
-                      handle_tool_bar_click (f, x, y, 0,
-                                             x_x_to_emacs_modifiers (dpyinfo,
+                    if (event.xbutton.type == ButtonPress)
+                      handle_tool_bar_click (f, x, y, 1, 0);
+                    else
+                      handle_tool_bar_click (f, x, y, 0,
+                                             x_x_to_emacs_modifiers (dpyinfo,
                                                                      event.xbutton.state));
-                    tool_bar_p = 1;
                   }
               }