Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 460-475)

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

 * gnus--rel--5.10  (patch 145-152)

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

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

20 files changed, 278 insertions, 141 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 79bfe7fe4eb..8590cb57230 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,91 @@
+2006-10-14  Richard Stallman  <rms@gnu.org>
+
+        * sysdep.c (init_sys_modes): Delete DEFVAR_LISP in the wrong place.
+
+2006-10-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (decode_mode_spec): Ignore %c and %l constructs in frame
+        title.
+
+2006-10-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keymap.c (Fkey_binding): Check Lisp_Object types before doing
+        XCAR and XINT.
+
+2006-10-12  Romain Francoise  <romain@orebokech.com>
+
+        * image.c (xbm_read_bitmap_data): Delete extra semicolon.
+
+2006-10-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c: Include xterm.h for x_fully_uncatch_errors and friends.
+
+        * dispextern.h: Declare x_create_bitmap_from_xpm_data.
+
+        * xterm.c (x_check_expected_move): Remove unused var `count'.
+
+        * xmenu.c (syms_of_xmenu): Use Ffset rather than Fdefalias, since
+        Fdefalias is not declared in any *.h file.
+
+2006-10-09  Chong Yidong  <cyd@stupidchicken.com>
+
+        * dispnew.c (sit_for): Sit forever if TIMEOUT is t.
+
+        * keyboard.c (command_loop_1): Handle non-number values of
+        `minibuffer-message-timeout'.
+        (Fexecute_extended_command): Fix typo.
+
+        * minibuf.c (temp_echo_area_glyphs): Sit for
+        `minibuffer-message-timeout' seconds.
+
+2006-10-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (mac_draw_image_string, mac_draw_image_string_16):
+        Add argument OVERSTRIKE_P.
+        (mac_draw_string_common, mac_draw_image_string_cg): Likewise.
+        Support overstrike.
+        (mac_draw_string, mac_draw_string_16): Remove functions.
+        (x_draw_glyph_string_foreground): Use overstrike when needed.
+        (x_draw_composite_glyph_string_foreground): Likewise.
+        Use mac_draw_image_string_16 instead of mac_draw_string_16.
+        (mac_load_query_font): Rename from XLoadQueryFont.  Take argument F
+        instead of DPY.  All uses changed.  Don't save/restore font.
+
+2006-10-07  Ralf Angeli  <angeli@caeruleus.net>
+
+        * w32fns.c (w32_createwindow): Honour left and top positions if
+        supplied explicitly.
+
+2006-10-06  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (pos_visible_p): Fix value when EOB is visible.
+
+2006-10-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.c (Qinhibit_face_set_after_frame_default): New var.
+        (syms_of_frame): Initialize it.
+        (x_set_frame_parameters): Avoid resetting :font attributes to the
+        new-frame defaults.
+
+2006-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.h (clear_regexp_cache): Declare.
+
+        * search.c (compile_pattern): Only check `cp->syntax_table' if needed.
+        (compile_pattern_1): Remember `used_syntax' in `cp->syntax_table'.
+        (clear_regexp_cache): Only flush those regexps which depend on
+        a syntax-table.
+
+        * regex.c (regex_compile): Set the new `used_syntax' bit.
+
+        * regex.h: Remove file local variables.
+        (struct re_pattern_buffer): New field `used_syntax'.
+
+2006-10-03  Kim F. Storm  <storm@cua.dk>
+
+        * process.c (list_processes_1): Run sentinels before removing dead
+        processes.  Also remove `closed' network connections.
+
 2006-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xdisp.c (handle_fontified_prop): Don't fontify at EOB.
@@ -52,8 +140,8 @@
 
 2006-09-24  Eli Zaretskii  <eliz@gnu.org>
 
-        * makefile.w32-in ($(BLD)/fns.$(O), $(BLD)/w32proc.$(O)): Depend
-        on nt/inc/langinfo.h and nt/inc/nl_types.h.
+        * makefile.w32-in ($(BLD)/fns.$(O), $(BLD)/w32proc.$(O)):
+        Depend on nt/inc/langinfo.h and nt/inc/nl_types.h.
 
         * w32proc.c (nl_langinfo): New function.
 
@@ -235,8 +323,7 @@
 
 2006-09-15  David Kastrup  <dak@gnu.org>
 
-        * Makefile.in (keymap.o): Add "keymap.h" and "window.h"
-        dependencies.
+        * Makefile.in (keymap.o): Add "keymap.h" and "window.h" dependencies.
 
         * keymap.c: include "window.h".
         (Fcommand_remapping): New optional POSITION argument.
@@ -1477,7 +1564,7 @@
         (x_set_offset, x_check_fullscreen): Extensive changes to make
         frame positioning deterministic under X.
 
-        * xterm.h (x_output): Added members left_before_move and
+        * xterm.h (x_output): Add members left_before_move and
         top_before_move.  Removed members expected_left and expected_top.
 
 2006-06-16  Kim F. Storm  <storm@cua.dk>
diff --git a/src/dispextern.h b/src/dispextern.h
index 1f768dd323c..5eb7ee11dea 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2794,6 +2794,9 @@ extern void x_reference_bitmap P_ ((struct frame *, int));
 extern int x_create_bitmap_from_data P_ ((struct frame *, char *,
                                           unsigned int, unsigned int));
 extern int x_create_bitmap_from_file P_ ((struct frame *, Lisp_Object));
+#if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
+extern int x_create_bitmap_from_xpm_data P_ ((struct frame *f, char **bits));
+#endif
 #ifndef x_destroy_bitmap
 extern void x_destroy_bitmap P_ ((struct frame *, int));
 #endif
diff --git a/src/dispnew.c b/src/dispnew.c
index de8f2c1ad38..516f0b54ce6 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6488,7 +6488,8 @@ Emacs was built without floating point support.
 /* This is just like wait_reading_process_output, except that
    it does redisplay.
 
-   TIMEOUT is number of seconds to wait (float or integer).
+   TIMEOUT is number of seconds to wait (float or integer),
+   or t to wait forever.
    READING is 1 if reading input.
    If DO_DISPLAY is >0 display process output while waiting.
    If DO_DISPLAY is >1 perform an initial redisplay before waiting.
@@ -6521,10 +6522,15 @@ sit_for (timeout, reading, do_display)
       sec = (int) seconds;
       usec = (int) ((seconds - sec) * 1000000);
     }
+  else if (EQ (timeout, Qt))
+    {
+      sec = 0;
+      usec = 0;
+    }
   else
     wrong_type_argument (Qnumberp, timeout);
 
-  if (sec == 0 && usec == 0)
+  if (sec == 0 && usec == 0 && !EQ (timeout, Qt))
     return Qt;
 
 #ifdef SIGIO
diff --git a/src/eval.c b/src/eval.c
index dbd30eac201..4e04422d2d6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -28,6 +28,10 @@ Boston, MA 02110-1301, USA.  */
 #include "dispextern.h"
 #include <setjmp.h>
 
+#if HAVE_X_WINDOWS
+#include "xterm.h"
+#endif
+
 /* This definition is duplicated in alloc.c and keyboard.c */
 /* Putting it in lisp.h makes cc bomb out! */
 
diff --git a/src/frame.c b/src/frame.c
index c57618696eb..f431dc4946d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -116,6 +116,7 @@ Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth;
 Lisp_Object Qfont_backend;
 #endif  /* USE_FONT_BACKEND */
 
+Lisp_Object Qinhibit_face_set_after_frame_default;
 Lisp_Object Qface_set_after_frame_default;
 
 
@@ -2742,12 +2743,20 @@ x_set_frame_parameters (f, alist)
           || EQ (prop, Qfullscreen))
         {
           register Lisp_Object param_index, old_value;
+          int count = SPECPDL_INDEX ();
 
           old_value = get_frame_param (f, prop);
           fullscreen_is_being_set |= EQ (prop, Qfullscreen);
 
           if (NILP (Fequal (val, old_value)))
             {
+              /* For :font attributes, the frame_parm_handler
+                 x_set_font calls `face-set-after-frame-default'.
+                 Unless we bind inhibit-face-set-after-frame-default
+                 here, this would reset the :font attribute that we
+                 just applied to the default value for new faces.  */
+              specbind (Qinhibit_face_set_after_frame_default, Qt);
+
               store_frame_param (f, prop, val);
 
               param_index = Fget (prop, Qx_frame_parameter);
@@ -2756,6 +2765,8 @@ x_set_frame_parameters (f, alist)
                       < sizeof (frame_parms)/sizeof (frame_parms[0]))
                   && rif->frame_parm_handlers[XINT (param_index)])
                 (*(rif->frame_parm_handlers[XINT (param_index)])) (f, val, old_value);
+
+              unbind_to (count, Qnil);
             }
         }
     }
@@ -4112,6 +4123,10 @@ syms_of_frame ()
   Qface_set_after_frame_default = intern ("face-set-after-frame-default");
   staticpro (&Qface_set_after_frame_default);
 
+  Qinhibit_face_set_after_frame_default
+    = intern ("inhibit-face-set-after-frame-default");
+  staticpro (&Qinhibit_face_set_after_frame_default);
+
   Qfullwidth = intern ("fullwidth");
   staticpro (&Qfullwidth);
   Qfullheight = intern ("fullheight");
diff --git a/src/image.c b/src/image.c
index dac896137c3..30c01702d85 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3151,7 +3151,7 @@ xbm_read_bitmap_data (f, contents, end, width, height, data)
       expect_ident ("define");
       expect (XBM_TK_IDENT);
 
-      if (LA1 == XBM_TK_NUMBER);
+      if (LA1 == XBM_TK_NUMBER)
         {
           char *p = strrchr (buffer, '_');
           p = p ? p + 1 : buffer;
diff --git a/src/keyboard.c b/src/keyboard.c
index 786b3d9b556..61539a384fd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1546,15 +1546,17 @@ command_loop_1 ()
 
       if (minibuf_level
           && !NILP (echo_area_buffer[0])
-          && EQ (minibuf_window, echo_area_window)
-          && NUMBERP (Vminibuffer_message_timeout))
+          && EQ (minibuf_window, echo_area_window))
         {
           /* Bind inhibit-quit to t so that C-g gets read in
              rather than quitting back to the minibuffer.  */
           int count = SPECPDL_INDEX ();
           specbind (Qinhibit_quit, Qt);
 
-          sit_for (Vminibuffer_message_timeout, 0, 2);
+          if (NUMBERP (Vminibuffer_message_timeout))
+            sit_for (Vminibuffer_message_timeout, 0, 2);
+          else
+            sit_for (Qt, 0, 2);
 
           /* Clear the echo area.  */
           message2 (0, 0, 0);
@@ -9981,7 +9983,7 @@ give to the command you invoke, if it asks for an argument.  */)
       if (NILP (echo_area_buffer[0]))
         waited = sit_for (make_number (0), 0, 2);
       else if (NUMBERP (Vsuggest_key_bindings))
-        waited = sit_for (Vminibuffer_message_timeout, 0, 2);
+        waited = sit_for (Vsuggest_key_bindings, 0, 2);
       else
         waited = sit_for (make_number (2), 0, 2);
 
diff --git a/src/keymap.c b/src/keymap.c
index 237bc0db9df..f67cc109e87 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1643,13 +1643,12 @@ specified buffer position instead of point are used.
 
       /* We are not interested in locations without event data */
 
-      if (EVENT_HAS_PARAMETERS (event)) {
-        Lisp_Object kind;
-
-        kind = EVENT_HEAD_KIND (EVENT_HEAD (event));
-        if (EQ (kind, Qmouse_click))
-          position = EVENT_START (event);
-      }
+      if (EVENT_HAS_PARAMETERS (event))
+        {
+          Lisp_Object kind = EVENT_HEAD_KIND (EVENT_HEAD (event));
+          if (CONSP (XCDR (event)) && EQ (kind, Qmouse_click))
+            position = EVENT_START (event);
+        }
     }
 
   /* Key sequences beginning with mouse clicks
@@ -1742,7 +1741,8 @@ specified buffer position instead of point are used.
               
               pos = XCDR (string);
               string = XCAR (string);
-              if (XINT (pos) >= 0
+              if (INTEGERP (pos)
+                  && XINT (pos) >= 0
                   && XINT (pos) < SCHARS (string))
                 {
                   map = Fget_text_property (pos, Qlocal_map, string);
diff --git a/src/lisp.h b/src/lisp.h
index 4421dfedf95..787eface0ee 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2957,6 +2957,7 @@ extern int find_next_newline P_ ((int, int));
 extern int find_next_newline_no_quit P_ ((int, int));
 extern int find_before_next_newline P_ ((int, int, int));
 extern void syms_of_search P_ ((void));
+extern void clear_regexp_cache P_ ((void));
 
 /* defined in minibuf.c */
 
diff --git a/src/macterm.c b/src/macterm.c
index 719b703a77c..126fe513533 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -893,12 +893,13 @@ mac_invert_rectangle (f, x, y, width, height)
 
 
 static void
-mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
+mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width,
+                        overstrike_p, bytes_per_char)
      struct frame *f;
      GC gc;
      int x, y;
      char *buf;
-     int nchars, bg_width, bytes_per_char;
+     int nchars, bg_width, overstrike_p, bytes_per_char;
 {
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
@@ -948,6 +949,13 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
           ATSUDrawText (text_layout,
                         kATSUFromTextBeginning, kATSUToTextEnd,
                         kATSUUseGrafPortPenLoc, kATSUUseGrafPortPenLoc);
+          if (overstrike_p)
+            {
+              MoveTo (x + 1, y);
+              ATSUDrawText (text_layout,
+                            kATSUFromTextBeginning, kATSUToTextEnd,
+                            kATSUUseGrafPortPenLoc, kATSUUseGrafPortPenLoc);
+            }
           mac_end_clip (gc);
 #ifdef MAC_OSX
         }
@@ -991,9 +999,15 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
                                        sizeof (tags) / sizeof (tags[0]),
                                        tags, sizes, values);
           if (err == noErr)
-            ATSUDrawText (text_layout,
-                          kATSUFromTextBeginning, kATSUToTextEnd,
-                          Long2Fix (x), Long2Fix (port_height - y));
+            {
+              ATSUDrawText (text_layout,
+                            kATSUFromTextBeginning, kATSUToTextEnd,
+                            Long2Fix (x), Long2Fix (port_height - y));
+              if (overstrike_p)
+                ATSUDrawText (text_layout,
+                              kATSUFromTextBeginning, kATSUToTextEnd,
+                              Long2Fix (x + 1), Long2Fix (port_height - y));
+            }
 #if USE_CG_DRAWING
           mac_end_cg_clip (f);
           context = NULL;
@@ -1059,6 +1073,12 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
       TextFace (GC_FONT (gc)->mac_fontface);
       MoveTo (x, y);
       DrawText (buf, 0, nchars * bytes_per_char);
+      if (overstrike_p)
+        {
+          TextMode (srcOr);
+          MoveTo (x + 1, y);
+          DrawText (buf, 0, nchars * bytes_per_char);
+        }
       if (bg_width)
         RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f)));
       mac_end_clip (gc);
@@ -1071,59 +1091,33 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
 }
 
 
-/* Mac replacement for XDrawString.  */
-
-static void
-mac_draw_string (f, gc, x, y, buf, nchars)
-     struct frame *f;
-     GC gc;
-     int x, y;
-     char *buf;
-     int nchars;
-{
-  mac_draw_string_common (f, gc, x, y, buf, nchars, 0, 1);
-}
-
-
-/* Mac replacement for XDrawString16. */
-
-static void
-mac_draw_string_16 (f, gc, x, y, buf, nchars)
-     struct frame *f;
-     GC gc;
-     int x, y;
-     XChar2b *buf;
-     int nchars;
-{
-  mac_draw_string_common (f, gc, x, y, (char *) buf, nchars, 0, 2);
-}
-
-
 /* Mac replacement for XDrawImageString.  */
 
 static void
-mac_draw_image_string (f, gc, x, y, buf, nchars, bg_width)
+mac_draw_image_string (f, gc, x, y, buf, nchars, bg_width, overstrike_p)
      struct frame *f;
      GC gc;
      int x, y;
      char *buf;
-     int nchars, bg_width;
+     int nchars, bg_width, overstrike_p;
 {
-  mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, 1);
+  mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width,
+                          overstrike_p, 1);
 }
 
 
-/* Mac replacement for XDrawString16.  */
+/* Mac replacement for XDrawImageString16.  */
 
 static void
-mac_draw_image_string_16 (f, gc, x, y, buf, nchars, bg_width)
+mac_draw_image_string_16 (f, gc, x, y, buf, nchars, bg_width, overstrike_p)
      struct frame *f;
      GC gc;
      int x, y;
      XChar2b *buf;
-     int nchars, bg_width;
+     int nchars, bg_width, overstrike_p;
 {
-  mac_draw_string_common (f, gc, x, y, (char *) buf, nchars, bg_width, 2);
+  mac_draw_string_common (f, gc, x, y, (char *) buf, nchars, bg_width,
+                          overstrike_p, 2);
 }
 
 
@@ -1297,12 +1291,12 @@ init_cg_text_anti_aliasing_threshold ()
 }
 
 static int
-mac_draw_image_string_cg (f, gc, x, y, buf, nchars, bg_width)
+mac_draw_image_string_cg (f, gc, x, y, buf, nchars, bg_width, overstrike_p)
      struct frame *f;
      GC gc;
      int x, y;
      XChar2b *buf;
-     int nchars, bg_width;
+     int nchars, bg_width, overstrike_p;
 {
   CGrafPtr port;
   float port_height, gx, gy;
@@ -1364,10 +1358,17 @@ mac_draw_image_string_cg (f, gc, x, y, buf, nchars, bg_width)
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
   CGContextSetTextPosition (context, gx, gy);
   CGContextShowGlyphsWithAdvances (context, glyphs, advances, nchars);
+  if (overstrike_p)
+    {
+      CGContextSetTextPosition (context, gx + 1.0f, gy);
+      CGContextShowGlyphsWithAdvances (context, glyphs, advances, nchars);
+    }
 #else
   for (i = 0; i < nchars; i++)
     {
       CGContextShowGlyphsAtPoint (context, gx, gy, glyphs + i, 1);
+      if (overstrike_p)
+        CGContextShowGlyphsAtPoint (context, gx + 1.0f, gy, glyphs + i, 1);
       gx += advances[i].width;
     }
 #endif
@@ -2773,15 +2774,18 @@ x_draw_glyph_string_foreground (s)
 #if USE_CG_TEXT_DRAWING
         if (!s->two_byte_p
             && mac_draw_image_string_cg (s->f, s->gc, x, s->ybase - boff,
-                                         s->char2b, s->nchars, bg_width))
+                                         s->char2b, s->nchars, bg_width,
+                                         s->face->overstrike))
           ;
         else
 #endif
           mac_draw_image_string_16 (s->f, s->gc, x, s->ybase - boff,
-                                    s->char2b, s->nchars, bg_width);
+                                    s->char2b, s->nchars, bg_width,
+                                    s->face->overstrike);
       else
         mac_draw_image_string (s->f, s->gc, x, s->ybase - boff,
-                               char1b, s->nchars, bg_width);
+                               char1b, s->nchars, bg_width,
+                               s->face->overstrike);
     }
 }
 
@@ -2817,10 +2821,10 @@ x_draw_composite_glyph_string_foreground (s)
   else
     {
       for (i = 0; i < s->nchars; i++, ++s->gidx)
-        mac_draw_string_16 (s->f, s->gc,
-                            x + s->cmp->offsets[s->gidx * 2],
-                            s->ybase - s->cmp->offsets[s->gidx * 2 + 1],
-                            s->char2b + i, 1);
+        mac_draw_image_string_16 (s->f, s->gc,
+                                  x + s->cmp->offsets[s->gidx * 2],
+                                  s->ybase - s->cmp->offsets[s->gidx * 2 + 1],
+                                  s->char2b + i, 1, 0, s->face->overstrike);
     }
 }
 
@@ -7801,14 +7805,16 @@ is_fully_specified_xlfd (char *p)
 }
 
 
-/* XLoadQueryFont creates and returns an internal representation for a
-   font in a MacFontStruct struct.  There is really no concept
+/* mac_load_query_font creates and returns an internal representation
+   for a font in a MacFontStruct struct.  There is really no concept
    corresponding to "loading" a font on the Mac.  But we check its
    existence and find the font number and all other information for it
    and store them in the returned MacFontStruct.  */
 
 static MacFontStruct *
-XLoadQueryFont (Display *dpy, char *fontname)
+mac_load_query_font (f, fontname)
+     struct frame *f;
+     char *fontname;
 {
   int size;
   char *name;
@@ -8019,26 +8025,13 @@ XLoadQueryFont (Display *dpy, char *fontname)
   else
 #endif
     {
-      GrafPtr port;
-      SInt16 old_fontnum, old_fontsize;
-      Style old_fontface;
       FontInfo the_fontinfo;
       int is_two_byte_font;
 
 #if USE_CG_DRAWING
-      mac_prepare_for_quickdraw (NULL);
-#endif
-      /* Save the current font number used.  */
-      GetPort (&port);
-#if TARGET_API_MAC_CARBON
-      old_fontnum = GetPortTextFont (port);
-      old_fontsize = GetPortTextSize (port);
-      old_fontface = GetPortTextFace (port);
-#else
-      old_fontnum = port->txFont;
-      old_fontsize = port->txSize;
-      old_fontface = port->txFace;
+      mac_prepare_for_quickdraw (f);
 #endif
+      SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
       TextFont (fontnum);
       TextSize (size);
@@ -8120,11 +8113,6 @@ XLoadQueryFont (Display *dpy, char *fontname)
           for (c = 0x21, pcm = space_bounds + 1; c <= 0xff; c++, pcm++)
             mac_query_char_extents (NULL, c, NULL, NULL, pcm, NULL);
         }
-
-      /* Restore previous font number, size and face.  */
-      TextFont (old_fontnum);
-      TextSize (old_fontsize);
-      TextFace (old_fontface);
     }
 
   if (space_bounds)
@@ -8264,7 +8252,7 @@ x_load_font (f, fontname, size)
     fontname = (char *) SDATA (XCAR (font_names));
 
     BLOCK_INPUT;
-    font = (MacFontStruct *) XLoadQueryFont (FRAME_MAC_DISPLAY (f), fontname);
+    font = mac_load_query_font (f, fontname);
     UNBLOCK_INPUT;
     if (!font)
       return NULL;
diff --git a/src/minibuf.c b/src/minibuf.c
index 9505c22d39e..a61d61221a6 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2683,6 +2683,8 @@ If no minibuffer is active, return nil.  */)
    that has no possible completions, and other quick, unobtrusive
    messages.  */
 
+extern Lisp_Object Vminibuffer_message_timeout;
+
 void
 temp_echo_area_glyphs (string)
      Lisp_Object string;
@@ -2701,7 +2703,12 @@ temp_echo_area_glyphs (string)
   insert_from_string (string, 0, 0, SCHARS (string), SBYTES (string), 0);
   SET_PT_BOTH (opoint, opoint_byte);
   Vinhibit_quit = Qt;
-  sit_for (make_number (2), 0, 2);
+
+  if (NUMBERP (Vminibuffer_message_timeout))
+    sit_for (Vminibuffer_message_timeout, 0, 2);
+  else
+    sit_for (Qt, 0, 2);
+
   del_range_both (osize, osize_byte, ZV, ZV_BYTE, 1);
   SET_PT_BOTH (opoint, opoint_byte);
   if (!NILP (Vquit_flag))
diff --git a/src/process.c b/src/process.c
index c3bbb33509d..4497c1d38c0 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1313,6 +1313,7 @@ list_processes_1 (query_only)
   register struct Lisp_Process *p;
   char tembuf[300];
   int w_proc, w_buffer, w_tty;
+  int exited = 0;
   Lisp_Object i_status, i_buffer, i_tty, i_command;
 
   w_proc = 4;    /* Proc   */
@@ -1439,8 +1440,8 @@ list_processes_1 (query_only)
             }
         }
 
-      if (EQ (symbol, Qsignal) || EQ (symbol, Qexit))
-        remove_process (proc);
+      if (EQ (symbol, Qsignal) || EQ (symbol, Qexit) || EQ (symbol, Qclosed))
+        exited++;
 
       Findent_to (i_buffer, minspace);
       if (NILP (p->buffer))
@@ -1504,6 +1505,8 @@ list_processes_1 (query_only)
           insert_string ("\n");
        }
     }
+  if (exited)
+    status_notify (NULL);
   return Qnil;
 }
 
diff --git a/src/regex.c b/src/regex.c
index 09776848220..2eca58c23e8 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -2589,6 +2589,7 @@ regex_compile (pattern, size, syntax, bufp)
   bufp->syntax = syntax;
   bufp->fastmap_accurate = 0;
   bufp->not_bol = bufp->not_eol = 0;
+  bufp->used_syntax = 0;
 
   /* Set `used' to zero, so that if we return an error, the pattern
      printer (for debugging) will think there's no pattern.  We reset it
@@ -3014,6 +3015,14 @@ regex_compile (pattern, size, syntax, bufp)
                               }
                           }
 
+                        /* In most cases the matching rule for char classes
+                           only uses the syntax table for multibyte chars,
+                           so that the content of the syntax-table it is not
+                           hardcoded in the range_table.  SPACE and WORD are
+                           the two exceptions.  */
+                        if ((1 << cc) & ((1 << RECC_SPACE) | (1 << RECC_WORD)))
+                          bufp->used_syntax = 1;
+
                         /* Repeat the loop. */
                         continue;
                       }
diff --git a/src/regex.h b/src/regex.h
index efae7749f31..e065c597d49 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -392,6 +392,10 @@ struct re_pattern_buffer
         /* Similarly for an end-of-line anchor.  */
   unsigned not_eol : 1;
 
+  /* If true, the compilation of the pattern had to look up the syntax table,
+     so the compiled pattern is only valid for the current syntax table.  */
+  unsigned used_syntax : 1;
+
 #ifdef emacs
   /* If true, multi-byte form in the regexp pattern should be
      recognized as a multibyte character.  When the pattern is
@@ -620,13 +624,5 @@ extern void re_set_whitespace_regexp (const char *regexp);
 
 #endif /* regex.h */
 
-/*
-Local variables:
-make-backup-files: t
-version-control: t
-trim-versions-without-asking: nil
-End:
-*/
-
 /* arch-tag: bda6e3ec-3c02-4237-a55a-01ad2e120083
    (do not change this comment) */
diff --git a/src/search.c b/src/search.c
index 5f3f953595b..7c1090aa2bf 100644
--- a/src/search.c
+++ b/src/search.c
@@ -43,7 +43,8 @@ struct regexp_cache
   struct regexp_cache *next;
   Lisp_Object regexp, whitespace_regexp;
   /* Syntax table for which the regexp applies.  We need this because
-     of character classes.  */
+     of character classes.  If this is t, then the compiled pattern is valid
+     for any syntax-table.  */
   Lisp_Object syntax_table;
   struct re_pattern_buffer buf;
   char fastmap[0400];
@@ -137,7 +138,6 @@ compile_pattern_1 (cp, pattern, translate, regp, posix, multibyte)
   cp->buf.multibyte = STRING_MULTIBYTE (pattern);
   cp->buf.target_multibyte = multibyte;
   cp->whitespace_regexp = Vsearch_spaces_regexp;
-  cp->syntax_table = current_buffer->syntax_table;
   /* rms: I think BLOCK_INPUT is not needed here any more,
      because regex.c defines malloc to call xmalloc.
      Using BLOCK_INPUT here means the debugger won't run if an error occurs.
@@ -151,6 +151,10 @@ compile_pattern_1 (cp, pattern, translate, regp, posix, multibyte)
   val = (char *) re_compile_pattern ((char *) SDATA (pattern),
                                      SBYTES (pattern), &cp->buf);
 
+  /* If the compiled pattern hard codes some of the contents of the
+     syntax-table, it can only be reused with *this* syntax table.  */
+  cp->syntax_table = cp->buf.used_syntax ? current_buffer->syntax_table : Qt;
+
   re_set_whitespace_regexp (NULL);
 
   re_set_syntax (old);
@@ -178,7 +182,8 @@ shrink_regexp_cache ()
     }
 }
 
-/* Clear the regexp cache.
+/* Clear the regexp cache w.r.t. a particular syntax table,
+   because it was changed.
    There is no danger of memory leak here because re_compile_pattern
    automagically manages the memory in each re_pattern_buffer struct,
    based on its `allocated' and `buffer' values.  */
@@ -188,7 +193,11 @@ clear_regexp_cache ()
   int i;
 
   for (i = 0; i < REGEXP_CACHE_SIZE; ++i)
-    searchbufs[i].regexp = Qnil;
+    /* It's tempting to compare with the syntax-table we've actually changd,
+       but it's not sufficient because char-table inheritance mewans that
+       modifying one syntax-table can change others at the same time.  */
+    if (!EQ (searchbufs[i].syntax_table, Qt))
+      searchbufs[i].regexp = Qnil;
 }
 
 /* Compile a regexp if necessary, but first check to see if there's one in
@@ -227,10 +236,8 @@ compile_pattern (pattern, regp, translate, posix, multibyte)
           && EQ (cp->buf.translate, (! NILP (translate) ? translate : make_number (0)))
           && cp->posix == posix
           && cp->buf.target_multibyte == multibyte
-          /* TODO: Strictly speaking, we only need to match syntax
-             tables when a character class like [[:space:]] occurs in
-             the pattern. -- cyd*/
-          && EQ (cp->syntax_table, current_buffer->syntax_table)
+          && (EQ (cp->syntax_table, Qt)
+              || EQ (cp->syntax_table, current_buffer->syntax_table))
           && !NILP (Fequal (cp->whitespace_regexp, Vsearch_spaces_regexp)))
         break;
 
diff --git a/src/sysdep.c b/src/sysdep.c
index 307f69290d6..3fd134e476d 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1373,16 +1373,6 @@ init_sys_modes ()
 {
   struct emacs_tty tty;
 
-#ifdef MAC_OS8
-/* cus-start.el complains if delete-exited-processes is not defined */
-#ifndef subprocesses
-  DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes,
-               doc: /* *Non-nil means delete processes immediately when they exit.
-nil means don't delete them until `list-processes' is run.  */);
-  delete_exited_processes = 0;
-#endif
-#endif /* MAC_OS8 */
-
 #ifdef VMS
 #if 0
   static int oob_chars[2] = {0, 1 << 7}; /* catch C-g's */
diff --git a/src/w32fns.c b/src/w32fns.c
index f2e456b85bf..1381662c99c 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2109,7 +2109,12 @@ w32_createwindow (f)
         }
     }
 
-  if (EQ (left, Qunbound) && EQ (top, Qunbound))
+  if (f->size_hint_flags & USPosition || f->size_hint_flags & PPosition)
+    {
+      XSETINT (left, f->left_pos);
+      XSETINT (top, f->top_pos);
+    }
+  else if (EQ (left, Qunbound) && EQ (top, Qunbound))
     {
       /* When called with RES_TYPE_NUMBER, w32_get_arg will return zero
          for anything that is not a number and is not Qunbound.  */
diff --git a/src/xdisp.c b/src/xdisp.c
index 7ca259e2b10..fb30722d8b8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1355,7 +1355,8 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, rowh, vpos)
       it2 = it;
       if (IT_CHARPOS (it) < ZV && FETCH_BYTE (IT_BYTEPOS (it)) != '\n')
         move_it_by_lines (&it, 1, 0);
-      if (charpos < IT_CHARPOS (it))
+      if (charpos < IT_CHARPOS (it)
+          || (it.what == IT_EOB && charpos == IT_CHARPOS (it)))
         {
           visible_p = 1;
           move_it_to (&it2, charpos, -1, -1, -1, MOVE_TO_POS);
@@ -17823,12 +17824,20 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
       break;
 
     case 'c':
-      {
-        int col = (int) current_column (); /* iftc */
-        w->column_number_displayed = make_number (col);
-        pint2str (decode_mode_spec_buf, field_width, col);
-        return decode_mode_spec_buf;
-      }
+      /* %c and %l are ignored in `frame-title-format'.
+         (In redisplay_internal, the frame title is drawn _before_ the
+         windows are updated, so the stuff which depends on actual
+         window contents (such as %l) may fail to render properly, or
+         even crash emacs.)  */
+      if (mode_line_target == MODE_LINE_TITLE)
+        return "";
+      else
+        {
+          int col = (int) current_column (); /* iftc */
+          w->column_number_displayed = make_number (col);
+          pint2str (decode_mode_spec_buf, field_width, col);
+          return decode_mode_spec_buf;
+        }
 
     case 'e':
 #ifndef SYSTEM_MALLOC
@@ -17870,11 +17879,16 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
 
     case 'l':
       {
-        int startpos = XMARKER (w->start)->charpos;
-        int startpos_byte = marker_byte_position (w->start);
-        int line, linepos, linepos_byte, topline;
-        int nlines, junk;
-        int height = WINDOW_TOTAL_LINES (w);
+        int startpos, startpos_byte, line, linepos, linepos_byte;
+        int topline, nlines, junk, height;
+
+        /* %c and %l are ignored in `frame-title-format'.  */
+        if (mode_line_target == MODE_LINE_TITLE)
+          return "";
+
+        startpos = XMARKER (w->start)->charpos;
+        startpos_byte = marker_byte_position (w->start);
+        height = WINDOW_TOTAL_LINES (w);
 
         /* If we decided that this buffer isn't suitable for line numbers,
            don't forget that too fast.  */
@@ -24319,9 +24333,10 @@ This variable is not guaranteed to be accurate except while processing
   DEFVAR_LISP ("frame-title-format", &Vframe_title_format,
     doc: /* Template for displaying the title bar of visible frames.
 \(Assuming the window manager supports this feature.)
-This variable has the same structure as `mode-line-format' (which see),
-and is used only on frames for which no explicit name has been set
-\(see `modify-frame-parameters').  */);
+
+This variable has the same structure as `mode-line-format', except that
+the %c and %l constructs are ignored.  It is used only on frames for
+which no explicit name has been set \(see `modify-frame-parameters').  */);
 
   DEFVAR_LISP ("icon-title-format", &Vicon_title_format,
     doc: /* Template for displaying the title bar of an iconified frame.
diff --git a/src/xmenu.c b/src/xmenu.c
index 080f9e819a2..be77b9fdbd4 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -3776,8 +3776,7 @@ syms_of_xmenu ()
 
 #if defined (USE_GTK) || defined (USE_X_TOOLKIT)
   defsubr (&Smenu_bar_open);
-  Fdefalias (intern ("accelerate-menu"), intern (Smenu_bar_open.symbol_name),
-             Qnil);
+  Ffset (intern ("accelerate-menu"), intern (Smenu_bar_open.symbol_name));
 #endif
 
 #ifdef HAVE_MENUS
diff --git a/src/xterm.c b/src/xterm.c
index a75140fb9e3..856fbef435b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8638,7 +8638,7 @@ x_check_expected_move (f, expected_left, expected_top)
      int expected_left;
      int expected_top;
 {
-  int count = 0, current_left = 0, current_top = 0;
+  int current_left = 0, current_top = 0;
 
   /* x_real_positions returns the left and top offsets of the outermost
      window manager window around the frame.  */