Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-61

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 353-357)

   - Update from CVS

22 files changed, 474 insertions, 114 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6eeb4fc09f5..8736a6f156a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,105 @@
+2005-06-08  Steven Tamm  <steventamm@mac.com>
+
+        * unexmacosx.c (copy_data_segment): Copy __la_sym_ptr2 section
+        used by gcc4 on intel mac.
+
+2005-06-09  Kim F. Storm  <storm@cua.dk>
+
+        * search.c (Fmatch_data): Add optional RESEAT arg.  Unchain markers
+        in REUSE list if non-nil; free them if equal to evaporate.
+        (Fset_match_data): Add optional RESEAT arg.  Unchain markers in LIST
+        if non-nil; free them if equal to evaporate.  Use XCAR/XCDR.
+        (restore_search_regs): Rename from restore_match_data.  Uses changed.
+        (unwind_set_match_data): New function.
+        (record_unwind_save_match_data): New function like save-match-data.
+
+        * lisp.h (Fmatch_data, Fset_match_data): Fix EXFUN.
+        (record_unwind_save_match_data): Add prototype.
+        (restore_search_regs): Rename from restore_match_data.
+
+        * composite.c (compose_chars_in_text):
+        * eval.c (do_autoload):
+        * macmenu.c (set_frame_menubar):
+        * process.c (read_process_output, exec_sentinel):
+        * xmenu.c (set_frame_menubar):
+        * xdisp.c (prepare_menu_bars, update_menu_bar, update_tool_bar):
+        * w32menu.c (set_frame_menubar):
+        Use record_unwind_save_match_data.
+
+2005-06-08  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (get_next_display_element): Alter previous change:
+        Distinguish Vshow_nonbreak_escape = t or not t.
+        For t, use escape_glyph once again, as before previous change.
+        Use space or hyphen for display, instead of the non-ASCII char.
+        (syms_of_xdisp) <show-nonbreak-escape>: Doc fix.
+
+        * process.c (Fstart_process): Don't touch command_channel_p slot.
+
+        * process.h (struct process): Delete command_channel_p.
+
+2005-06-07  Masatake YAMATO  <jet@gyve.org>
+
+        * xdisp.c (note_mode_line_or_margin_highlight): Check
+        the overlapping of re-rendering area to avoid flickering.
+        (note_mouse_highlight): Call clear_mouse_face if PART
+        is not ON_MODE_LINE nor ON_HEADER_LINE.
+
+2005-06-07  Kim F. Storm  <storm@cua.dk>
+
+        * process.c: Improve commentary for adaptive read buffering.
+
+2005-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c (x_create_toolkit_scroll_bar): Use XtNarrowScrollbars
+        if available.
+
+2005-06-06  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * macmenu.c (menu_quit_handler, install_menu_quit_handler): New
+        functions for popping down menus on C-g.
+        (set_frame_menubar, mac_menu_show): Call install_menu_quit_handler.
+
+        * macterm.c: Make mac_quit_char_modifiers and mac_quit_char_keycode
+        non-static.
+
+        * config.in: Added HAVE_CANCELMENUTRACKING
+
+2005-06-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR): Remove
+        macros.
+
+        * unexw32.c (RVA_TO_PTR): Moved here from w32heap.h.
+
+        * w32proc.c (RVA_TO_PTR): New macro.
+
+        * w32heap.c (RVA_TO_PTR): No need to #undef now.
+
+        * makefile.w32-in ($(BLD)/emacs.$(O), $(BLD)/w32select.$(O)):
+        Depend on w32heap.h.
+
+2005-06-06  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * keyboard.c (command_loop_1): Update Vthis_original_command.
+
+2005-06-06  Richard M. Stallman  <rms@gnu.org>
+
+        * xmenu.c (popup_get_selection): Undo previous change.
+
+2005-06-06  Juri Linkov  <juri@jurta.org>
+
+        * xdisp.c (Qno_break_space): New variable.
+        (syms_of_xdisp): Initialize it.
+        (get_next_display_element): Add no-break space and soft hypen
+        codes for iso8859-2 and iso8859-5.  Don't add `\' for them.
+        Use `no-break-space' face for no-break spaces.
+
+2005-06-06  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * window.c (delete_window): Handle the case where a h/vchild has
+        a h/vchild.
+
 2005-06-05  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (sys_setsockopt): Change arg 4 to `const void *'.  In the
diff --git a/src/config.in b/src/config.in
index 6939ff2577c..93ee6488e0c 100644
--- a/src/config.in
+++ b/src/config.in
@@ -96,6 +96,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `bzero' function. */
 #undef HAVE_BZERO
 
+/* Define to 1 if CancelMenuTracking is available (Mac OSX). */
+#undef HAVE_CANCELMENUTRACKING
+
 /* Define to 1 if you are using the Carbon API on Mac OS X. */
 #undef HAVE_CARBON
 
@@ -782,9 +785,9 @@ Boston, MA 02111-1307, USA.  */
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define to 1 if you have the ANSI C header files. */
diff --git a/src/eval.c b/src/eval.c
index 0eb1482ee0b..46affcac418 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1971,7 +1971,7 @@ do_autoload (fundef, funname)
   GCPRO3 (fun, funname, fundef);
 
   /* Preserve the match data.  */
-  record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
+  record_unwind_save_match_data ();
 
   /* Value saved here is to be restored into Vautoload_queue.  */
   record_unwind_protect (un_autoload, Vautoload_queue);
diff --git a/src/image.c b/src/image.c
index 15e835fef3b..bc88c9d1d04 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6265,8 +6265,8 @@ jpeg_image_p (object)
 #endif /* HAVE_STLIB_H */
 
 #if defined (HAVE_NTGUI) && !defined (__WIN32__)
-/* jpeglib.h will define boolean differently depending on __WIN32__,
-   so make sure it is defined.  */
+/* In older releases of the jpeg library, jpeglib.h will define boolean
+   differently depending on __WIN32__, so make sure it is defined.  */
 #define __WIN32__ 1
 #endif
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 31c0b5d709c..dee131b8c61 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1522,6 +1522,7 @@ command_loop_1 ()
 
       Vthis_command = Qnil;
       real_this_command = Qnil;
+      Vthis_original_command = Qnil;
 
       /* Read next key sequence; i gets its length.  */
       i = read_key_sequence (keybuf, sizeof keybuf / sizeof keybuf[0],
diff --git a/src/lisp.h b/src/lisp.h
index fa08ab07dce..af07de3fbaa 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2804,6 +2804,7 @@ EXFUN (Fbuffer_disable_undo, 1);
 EXFUN (Fbuffer_enable_undo, 1);
 EXFUN (Ferase_buffer, 0);
 extern Lisp_Object Qoverlayp;
+extern Lisp_Object Qevaporate;
 extern Lisp_Object get_truename_buffer P_ ((Lisp_Object));
 extern struct buffer *all_buffers;
 EXFUN (Fprevious_overlay_change, 1);
@@ -2871,11 +2872,12 @@ extern void syms_of_abbrev P_ ((void));
 /* defined in search.c */
 extern void shrink_regexp_cache P_ ((void));
 EXFUN (Fstring_match, 3);
-extern void restore_match_data P_ ((void));
-EXFUN (Fmatch_data, 2);
-EXFUN (Fset_match_data, 1);
+extern void restore_search_regs P_ ((void));
+EXFUN (Fmatch_data, 3);
+EXFUN (Fset_match_data, 2);
 EXFUN (Fmatch_beginning, 1);
 EXFUN (Fmatch_end, 1);
+extern void record_unwind_save_match_data P_ ((void));
 EXFUN (Flooking_at, 1);
 extern int fast_string_match P_ ((Lisp_Object, Lisp_Object));
 extern int fast_c_string_match_ignore_case P_ ((Lisp_Object, const char *));
diff --git a/src/macmenu.c b/src/macmenu.c
index e97a968d92d..ee83a5f609f 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -1356,6 +1356,68 @@ update_submenu_strings (first_wv)
 }
 
 
+/* Event handler function that pops down a menu on C-g.  We can only pop
+   down menus if CancelMenuTracking is present (OSX 10.3 or later).  */
+
+#ifdef HAVE_CANCELMENUTRACKING
+static pascal OSStatus
+menu_quit_handler (nextHandler, theEvent, userData)
+     EventHandlerCallRef nextHandler;
+     EventRef theEvent;
+     void* userData;
+{
+  UInt32 keyCode;
+  UInt32 keyModifiers;
+  extern int mac_quit_char_modifiers;
+  extern int mac_quit_char_keycode;
+
+  GetEventParameter (theEvent, kEventParamKeyCode,
+                     typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode);
+
+  GetEventParameter (theEvent, kEventParamKeyModifiers,
+                     typeUInt32, NULL, sizeof(UInt32),
+                     NULL, &keyModifiers);
+
+  if (keyCode == mac_quit_char_keycode
+      && keyModifiers == mac_quit_char_modifiers)
+    {
+      MenuRef menu = userData != 0
+        ? (MenuRef)userData : AcquireRootMenu ();
+
+      CancelMenuTracking (menu, true, 0);
+      if (!userData) ReleaseMenu (menu);
+      return noErr;
+    }
+
+  return CallNextEventHandler (nextHandler, theEvent);
+}
+#endif /* HAVE_CANCELMENUTRACKING */
+
+/* Add event handler for MENU_HANDLE so we can detect C-g.
+   If MENU_HANDLE is NULL, install handler for all menus in the menu bar.
+   If CancelMenuTracking isn't available, do nothing.  */
+
+static void
+install_menu_quit_handler (MenuHandle menu_handle)
+{
+#ifdef HAVE_CANCELMENUTRACKING
+  EventHandlerUPP handler = NewEventHandlerUPP(menu_quit_handler);
+  UInt32 numTypes = 1;
+  EventTypeSpec typesList[] = { { kEventClassKeyboard, kEventRawKeyDown } };
+  int i = MIN_MENU_ID;
+  MenuHandle menu = menu_handle ? menu_handle : GetMenuHandle (i);
+
+  while (menu != NULL)
+    {
+      InstallMenuEventHandler (menu, handler, GetEventTypeCount (typesList),
+                               typesList, menu_handle, NULL);
+      if (menu_handle) break;
+      menu = GetMenuHandle (++i);
+    }
+  DisposeEventHandlerUPP (handler);
+#endif /* HAVE_CANCELMENUTRACKING */
+}
+
 /* Set the contents of the menubar widgets of frame F.
    The argument FIRST_TIME is currently ignored;
    it is set the first time this is called, from initialize_frame_menubar.  */
@@ -1413,7 +1475,7 @@ set_frame_menubar (f, first_time, deep_p)
          because it is not reentrant.  */
       specbind (Qdebug_on_next_call, Qnil);
 
-      record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
+      record_unwind_save_match_data ();
       if (NILP (Voverriding_local_map_menu_flag))
         {
           specbind (Qoverriding_terminal_local_map, Qnil);
@@ -1575,6 +1637,8 @@ set_frame_menubar (f, first_time, deep_p)
 
   DrawMenuBar ();
 
+  /* Add event handler so we can detect C-g. */
+  install_menu_quit_handler (NULL);
   free_menubar_widget_value_tree (first_wv);
 
   UNBLOCK_INPUT;
@@ -1606,7 +1670,43 @@ free_frame_menubar (f)
 }
 
 
-/* mac_menu_show actually displays a menu using the panes and items in
+static Lisp_Object
+pop_down_menu (arg)
+     Lisp_Object arg;
+{
+  struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));
+  struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));
+
+  FRAME_PTR f = p1->pointer;
+  MenuHandle *menu = p2->pointer;
+
+  BLOCK_INPUT;
+
+  /* Must reset this manually because the button release event is not
+     passed to Emacs event loop. */
+  FRAME_MAC_DISPLAY_INFO (f)->grabbed = 0;
+
+  /* delete all menus */
+  {
+    int i = MIN_POPUP_SUBMENU_ID;
+    MenuHandle submenu = GetMenuHandle (i);
+    while (submenu != NULL)
+      {
+        DeleteMenu (i);
+        DisposeMenu (submenu);
+        submenu = GetMenuHandle (++i);
+      }
+  }
+
+  DeleteMenu (POPUP_SUBMENU_ID);
+  DisposeMenu (*menu);
+
+  UNBLOCK_INPUT;
+
+  return Qnil;
+}
+
+/* Mac_menu_show actually displays a menu using the panes and items in
    menu_items and returns the value selected from it; we assume input
    is blocked by the caller.  */
 
@@ -1644,6 +1744,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
     = (Lisp_Object *) alloca (menu_items_used * sizeof (Lisp_Object));
   int submenu_depth = 0;
   int first_pane;
+  int specpdl_count = SPECPDL_INDEX ();
 
   *error = NULL;
 
@@ -1817,7 +1918,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
         title = ENCODE_MENU_STRING (title);
 #endif
       wv_title->name = (char *) SDATA (title);
-      wv_title->enabled = TRUE;
+      wv_title->enabled = FALSE;
       wv_title->title = TRUE;
       wv_title->button_type = BUTTON_TYPE_NONE;
       wv_title->help = Qnil;
@@ -1830,6 +1931,10 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   submenu_id = MIN_POPUP_SUBMENU_ID;
   fill_submenu (menu, first_wv->contents);
 
+  /* Free the widget_value objects we used to specify the
+     contents.  */
+  free_menubar_widget_value_tree (first_wv);
+
   /* Adjust coordinates to be root-window-relative.  */
   pos.h = x;
   pos.v = y;
@@ -1844,11 +1949,18 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
 
   InsertMenu (menu, -1);
 
+  record_unwind_protect (pop_down_menu,
+                         Fcons (make_save_value (f, 0),
+                                make_save_value (&menu, 0)));
+
+  /* Add event handler so we can detect C-g. */
+  install_menu_quit_handler (menu);
+
   /* Display the menu.  */
   menu_item_choice = PopUpMenuSelect (menu, pos.v, pos.h, 0);
   menu_item_selection = LoWord (menu_item_choice);
 
-  /* Get the refcon to find the correct item*/
+  /* Get the refcon to find the correct item */
   if (menu_item_selection)
     {
       MenuHandle sel_menu = GetMenuHandle (HiWord (menu_item_choice));
@@ -1856,35 +1968,10 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
         GetMenuItemRefCon (sel_menu, menu_item_selection, &refcon);
       }
     }
-
-#if 0
-  /* Clean up extraneous mouse events which might have been generated
-     during the call.  */
-  discard_mouse_events ();
-#endif
-
-  /* Must reset this manually because the button release event is not
-     passed to Emacs event loop. */
-  FRAME_MAC_DISPLAY_INFO (f)->grabbed = 0;
-
-  /* Free the widget_value objects we used to specify the
-     contents.  */
-  free_menubar_widget_value_tree (first_wv);
-
-  /* delete all menus */
-  {
-    int i = MIN_POPUP_SUBMENU_ID;
-    MenuHandle submenu = GetMenuHandle (i);
-    while (submenu != NULL)
-      {
-        DeleteMenu (i);
-        DisposeMenu (submenu);
-        submenu = GetMenuHandle (++i);
-      }
-  }
-
-  DeleteMenu (POPUP_SUBMENU_ID);
-  DisposeMenu (menu);
+  else if (! for_click)
+    /* Make "Cancel" equivalent to C-g unless this menu was popped up by
+       a mouse press.  */
+    Fsignal (Qquit, Qnil);
 
   /* Find the selected item, and its pane, to return
      the proper value.  */
@@ -1944,6 +2031,8 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
     /* Make "Cancel" equivalent to C-g.  */
     Fsignal (Qquit, Qnil);
 
+  unbind_to (specpdl_count, Qnil);
+
   return Qnil;
 }
 
diff --git a/src/macterm.c b/src/macterm.c
index 13d8fb455d8..dd48d43a039 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -9916,8 +9916,8 @@ MakeMeTheFrontProcess ()
 /***** Code to handle C-g testing  *****/
 
 /* Contains the Mac modifier formed from quit_char */
-static mac_quit_char_modifiers = 0;
-static mac_quit_char_keycode;
+int mac_quit_char_modifiers = 0;
+int mac_quit_char_keycode;
 extern int quit_char;
 
 static void
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 553ebb72abb..471f0cbc6ea 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -634,6 +634,7 @@ $(BLD)/emacs.$(O) : \
         $(SRC)/termhooks.h \
         $(SRC)/w32bdf.h \
         $(SRC)/w32gui.h \
+        $(SRC)/w32heap.h \
         $(SRC)/window.h
 
 $(BLD)/eval.$(O) : \
@@ -1494,6 +1495,7 @@ $(BLD)/w32select.$(O): \
         $(SRC)/systime.h \
         $(SRC)/w32bdf.h \
         $(SRC)/w32gui.h \
+        $(SRC)/w32heap.h \
         $(SRC)/w32term.h
 
 $(BLD)/w32reg.$(O): \
diff --git a/src/process.c b/src/process.c
index 34966d35160..d60fe1e3bf6 100644
--- a/src/process.c
+++ b/src/process.c
@@ -272,17 +272,19 @@ int update_tick;
 #define READ_OUTPUT_DELAY_MAX       (READ_OUTPUT_DELAY_INCREMENT * 5)
 #define READ_OUTPUT_DELAY_MAX_MAX   (READ_OUTPUT_DELAY_INCREMENT * 7)
 
-/* Number of processes which might be delayed.  */
+/* Number of processes which have a non-zero read_output_delay,
+   and therefore might be delayed for adaptive read buffering.  */
 
 static int process_output_delay_count;
 
-/* Non-zero if any process has non-nil process_output_skip.  */
+/* Non-zero if any process has non-nil read_output_skip.  */
 
 static int process_output_skip;
 
 /* Non-nil means to delay reading process output to improve buffering.
    A value of t means that delay is reset after each send, any other
-   non-nil value does not reset the delay.  */
+   non-nil value does not reset the delay.  A value of nil disables
+   adaptive read buffering completely.  */
 static Lisp_Object Vprocess_adaptive_read_buffering;
 #else
 #define process_output_delay_count 0
@@ -1536,7 +1538,6 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
 
   XPROCESS (proc)->childp = Qt;
   XPROCESS (proc)->plist = Qnil;
-  XPROCESS (proc)->command_channel_p = Qnil;
   XPROCESS (proc)->buffer = buffer;
   XPROCESS (proc)->sentinel = Qnil;
   XPROCESS (proc)->filter = Qnil;
@@ -4320,6 +4321,11 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
 #endif
 
 #ifdef ADAPTIVE_READ_BUFFERING
+          /* Set the timeout for adaptive read buffering if any
+             process has non-nil read_output_skip and non-zero
+             read_output_delay, and we are not reading output for a
+             specific wait_channel.  It is not executed if
+             Vprocess_adaptive_read_buffering is nil.  */
           if (process_output_skip && check_delay > 0)
             {
               int usecs = EMACS_USECS (timeout);
@@ -4330,6 +4336,8 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
                   proc = chan_process[channel];
                   if (NILP (proc))
                     continue;
+                  /* Find minimum non-zero read_output_delay among the
+                     processes with non-nil read_output_skip.  */
                   if (XINT (XPROCESS (proc)->read_output_delay) > 0)
                     {
                       check_delay--;
@@ -4880,10 +4888,10 @@ read_process_output (proc, channel)
         {
           Lisp_Object tem;
           /* Don't clobber the CURRENT match data, either!  */
-          tem = Fmatch_data (Qnil, Qnil);
-          restore_match_data ();
-          record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
-          Fset_match_data (tem);
+          tem = Fmatch_data (Qnil, Qnil, Qnil);
+          restore_search_regs ();
+          record_unwind_save_match_data ();
+          Fset_match_data (tem, Qt);
         }
 
       /* For speed, if a search happens within this code,
@@ -4939,7 +4947,7 @@ read_process_output (proc, channel)
                                    read_process_output_error_handler);
 
       /* If we saved the match data nonrecursively, restore it now.  */
-      restore_match_data ();
+      restore_search_regs ();
       running_asynch_code = outer_running_asynch_code;
 
       /* Handling the process output should not deactivate the mark.  */
@@ -6338,10 +6346,10 @@ exec_sentinel (proc, reason)
   if (outer_running_asynch_code)
     {
       Lisp_Object tem;
-      tem = Fmatch_data (Qnil, Qnil);
-      restore_match_data ();
-      record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
-      Fset_match_data (tem);
+      tem = Fmatch_data (Qnil, Qnil, Qnil);
+      restore_search_regs ();
+      record_unwind_save_match_data ();
+      Fset_match_data (tem, Qt);
     }
 
   /* For speed, if a search happens within this code,
@@ -6355,7 +6363,7 @@ exec_sentinel (proc, reason)
                              exec_sentinel_error_handler);
 
   /* If we saved the match data nonrecursively, restore it now.  */
-  restore_match_data ();
+  restore_search_regs ();
   running_asynch_code = outer_running_asynch_code;
 
   Vdeactivate_mark = odeactivate;
@@ -6709,7 +6717,7 @@ init_process ()
 #endif /* HAVE_SOCKETS */
 
 #if defined (DARWIN) || defined (MAC_OSX)
-  /* PTYs are broken on Darwin < 6, but are sometimes useful for interactive 
+  /* PTYs are broken on Darwin < 6, but are sometimes useful for interactive
      processes.  As such, we only change the default value.  */
  if (initialized)
   {
diff --git a/src/process.h b/src/process.h
index 6e2641d6b06..8e3f9028c0b 100644
--- a/src/process.h
+++ b/src/process.h
@@ -52,8 +52,6 @@ struct Lisp_Process
     Lisp_Object buffer;
     /* Number of this process */
     Lisp_Object pid;
-    /* Non-nil if this is really a command channel */
-    Lisp_Object command_channel_p;
     /* t if this is a real child process.
        For a net connection, it is a plist based on the arguments to make-network-process.  */
     Lisp_Object childp;
@@ -105,7 +103,7 @@ struct Lisp_Process
        Initialized from `Vprocess_adaptive_read_buffering'.  */
     Lisp_Object adaptive_read_buffering;
     /* Hysteresis to try to read process output in larger blocks.
-       On some systems, e.g. the Linux kernel, emacs is seen as 
+       On some systems, e.g. GNU/Linux, Emacs is seen as 
        an interactive app also when reading process output, meaning
        that process output can be read in as little as 1 byte at a
        time.  Value is micro-seconds to delay reading output from
diff --git a/src/search.c b/src/search.c
index b7d3e78ac1d..18f92f41327 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2701,7 +2701,7 @@ Zero means the entire text matched by the whole regexp or whole string.  */)
   return match_limit (subexp, 0);
 }
 
-DEFUN ("match-data", Fmatch_data, Smatch_data, 0, 2, 0,
+DEFUN ("match-data", Fmatch_data, Smatch_data, 0, 3, 0,
        doc: /* Return a list containing all info on what the last search matched.
 Element 2N is `(match-beginning N)'; element 2N + 1 is `(match-end N)'.
 All the elements are markers or nil (nil if the Nth pair didn't match)
@@ -2713,17 +2713,35 @@ integers \(rather than markers) to represent buffer positions.  In
 this case, and if the last match was in a buffer, the buffer will get
 stored as one additional element at the end of the list.
 
-If REUSE is a list, reuse it as part of the value.  If REUSE is long enough
-to hold all the values, and if INTEGERS is non-nil, no consing is done.
+If REUSE is a list, reuse it as part of the value.  If REUSE is long
+enough to hold all the values, and if INTEGERS is non-nil, no consing
+is done.
+
+If optional third arg RESEAT is non-nil, any previous markers on the
+REUSE list will be modified to point to nowhere.
+
+If RESEAT is `evaporate', put markers back on the free list.
+Note: No other references to the markers must exist if you use this.
 
 Return value is undefined if the last search failed.  */)
-     (integers, reuse)
-     Lisp_Object integers, reuse;
+  (integers, reuse, reseat)
+     Lisp_Object integers, reuse, reseat;
 {
   Lisp_Object tail, prev;
   Lisp_Object *data;
   int i, len;
 
+  if (!NILP (reseat))
+    for (tail = reuse; CONSP (tail); tail = XCDR (tail))
+      if (MARKERP (XCAR (tail)))
+        {
+          if (EQ (reseat, Qevaporate))
+            free_marker (XCAR (tail));
+          else
+            unchain_marker (XMARKER (XCAR (tail)));
+          XSETCAR (tail, Qnil);
+        }
+
   if (NILP (last_thing_searched))
     return Qnil;
 
@@ -2759,10 +2777,10 @@ Return value is undefined if the last search failed.  */)
             /* last_thing_searched must always be Qt, a buffer, or Qnil.  */
             abort ();
 
-          len = 2*(i+1);
+          len = 2 * i + 2;
         }
       else
-        data[2 * i] = data [2 * i + 1] = Qnil;
+        data[2 * i] = data[2 * i + 1] = Qnil;
     }
 
   if (BUFFERP (last_thing_searched) && !NILP (integers))
@@ -2796,11 +2814,15 @@ Return value is undefined if the last search failed.  */)
 }
 
 
-DEFUN ("set-match-data", Fset_match_data, Sset_match_data, 1, 1, 0,
+DEFUN ("set-match-data", Fset_match_data, Sset_match_data, 1, 2, 0,
        doc: /* Set internal data on last search match from elements of LIST.
-LIST should have been created by calling `match-data' previously.  */)
-     (list)
-     register Lisp_Object list;
+LIST should have been created by calling `match-data' previously.
+
+If optional arg RESEAT is non-nil, make markers on LIST point nowhere.
+If RESEAT is `evaporate', put the markers back on the free list.
+Note: No other references to the markers must exist if you use this.  */)
+    (list, reseat)
+     register Lisp_Object list, reseat;
 {
   register int i;
   register Lisp_Object marker;
@@ -2844,9 +2866,9 @@ LIST should have been created by calling `match-data' previously.  */)
         search_regs.num_regs = length;
       }
 
-    for (i = 0;; i++)
+    for (i = 0; CONSP (list); i++)
       {
-        marker = Fcar (list);
+        marker = XCAR (list);
         if (BUFFERP (marker))
           {
             last_thing_searched = marker;
@@ -2857,12 +2879,14 @@ LIST should have been created by calling `match-data' previously.  */)
         if (NILP (marker))
           {
             search_regs.start[i] = -1;
-            list = Fcdr (list);
+            list = XCDR (list);
           }
         else
           {
             int from;
+            Lisp_Object m;
 
+            m = marker;
             if (MARKERP (marker))
               {
                 if (XMARKER (marker)->buffer == 0)
@@ -2873,17 +2897,38 @@ LIST should have been created by calling `match-data' previously.  */)
 
             CHECK_NUMBER_COERCE_MARKER (marker);
             from = XINT (marker);
-            list = Fcdr (list);
 
-            marker = Fcar (list);
+            if (!NILP (reseat) && MARKERP (m))
+              {
+                if (EQ (reseat, Qevaporate))
+                  free_marker (m);
+                else
+                  unchain_marker (XMARKER (m));
+                XSETCAR (list, Qnil);
+              }
+
+            if ((list = XCDR (list), !CONSP (list)))
+              break;
+
+            m = marker = XCAR (list);
+
             if (MARKERP (marker) && XMARKER (marker)->buffer == 0)
               XSETFASTINT (marker, 0);
 
             CHECK_NUMBER_COERCE_MARKER (marker);
             search_regs.start[i] = from;
             search_regs.end[i] = XINT (marker);
+
+            if (!NILP (reseat) && MARKERP (m))
+              {
+                if (EQ (reseat, Qevaporate))
+                  free_marker (m);
+                else
+                  unchain_marker (XMARKER (m));
+                XSETCAR (list, Qnil);
+              }
           }
-        list = Fcdr (list);
+        list = XCDR (list);
       }
 
     for (; i < search_regs.num_regs; i++)
@@ -2921,7 +2966,7 @@ save_search_regs ()
 
 /* Called upon exit from filters and sentinels. */
 void
-restore_match_data ()
+restore_search_regs ()
 {
   if (search_regs_saved)
     {
@@ -2939,6 +2984,21 @@ restore_match_data ()
     }
 }
 
+static Lisp_Object
+unwind_set_match_data (list)
+     Lisp_Object list;
+{
+  return Fset_match_data (list, Qevaporate);
+}
+
+/* Called to unwind protect the match data.  */
+void
+record_unwind_save_match_data ()
+{
+  record_unwind_protect (unwind_set_match_data,
+                         Fmatch_data (Qnil, Qnil, Qnil));
+}
+
 /* Quote a string to inactivate reg-expr chars */
 
 DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0,
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index e54dbea448c..1a2c211a09d 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -695,6 +695,7 @@ copy_data_segment (struct load_command *lc)
         }
       else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
                || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
+               || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0
                || strncmp (sectp->sectname, "__dyld", 16) == 0
                || strncmp (sectp->sectname, "__const", 16) == 0
                || strncmp (sectp->sectname, "__cfstring", 16) == 0)
diff --git a/src/unexw32.c b/src/unexw32.c
index b1838644965..1b2dbe74c31 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -325,6 +325,9 @@ relocate_offset (DWORD offset,
 /* Convert address in executing image to RVA.  */
 #define PTR_TO_RVA(ptr) ((DWORD)(ptr) - (DWORD) GetModuleHandle (NULL))
 
+#define RVA_TO_PTR(var,section,filedata) \
+          ((void *)(RVA_TO_OFFSET(var,section) + (filedata).file_base))
+
 #define PTR_TO_OFFSET(ptr, pfile_data) \
           ((unsigned char *)(ptr) - (pfile_data)->file_base)
 
diff --git a/src/w32heap.c b/src/w32heap.c
index d947842474f..4c28718a510 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA.
 #include "w32heap.h"
 #include "lisp.h"  /* for VALMASK */
 
-#undef RVA_TO_PTR
 #define RVA_TO_PTR(rva) ((unsigned char *)((DWORD)(rva) + (DWORD)GetModuleHandle (NULL)))
 
 /* This gives us the page size and the size of the allocation unit on NT.  */
diff --git a/src/w32heap.h b/src/w32heap.h
index 7fdf952683c..556c7fb28b4 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -82,15 +82,6 @@ typedef struct file_data {
     unsigned char *file_base;
 } file_data;
 
-#define OFFSET_TO_RVA(var,section) \
-          (section->VirtualAddress + ((DWORD)(var) - section->PointerToRawData))
-
-#define RVA_TO_OFFSET(var,section) \
-          (section->PointerToRawData + ((DWORD)(var) - section->VirtualAddress))
-
-#define RVA_TO_PTR(var,section,filedata) \
-          ((void *)(RVA_TO_OFFSET(var,section) + (filedata).file_base))
-
 int open_input_file (file_data *p_file, char *name);
 int open_output_file (file_data *p_file, char *name, unsigned long size);
 void close_file_data (file_data *p_file);
diff --git a/src/w32menu.c b/src/w32menu.c
index 8a90eae7ec7..c5af0aae980 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1443,7 +1443,8 @@ set_frame_menubar (f, first_time, deep_p)
          because it is not reentrant.  */
       specbind (Qdebug_on_next_call, Qnil);
 
-      record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
+      record_unwind_save_match_data ();
+
       if (NILP (Voverriding_local_map_menu_flag))
         {
           specbind (Qoverriding_terminal_local_map, Qnil);
diff --git a/src/w32proc.c b/src/w32proc.c
index 9abee2bf0c2..48b5e2c14a3 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -57,6 +57,11 @@ extern BOOL WINAPI IsValidLocale(LCID, DWORD);
 #include "syssignal.h"
 #include "w32term.h"
 
+#define RVA_TO_PTR(var,section,filedata) \
+  ((void *)((section)->PointerToRawData                                 \
+            + ((DWORD)(var) - (section)->VirtualAddress)                \
+            + (filedata).file_base))
+
 /* Control whether spawnve quotes arguments as necessary to ensure
    correct parsing by child process.  Because not all uses of spawnve
    are careful about constructing argv arrays, we make this behaviour
diff --git a/src/window.c b/src/window.c
index 35aeb4411ae..4d7c71f82c6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1452,8 +1452,10 @@ delete_window (window)
   tem = par->hchild;
   if (NILP (tem))
     tem = par->vchild;
-  if (NILP (XWINDOW (tem)->next))
+  if (NILP (XWINDOW (tem)->next)) {
     replace_window (parent, tem);
+    par = XWINDOW (tem);
+  }
 
   /* Since we may be deleting combination windows, we must make sure that
      not only p but all its children have been marked as deleted.  */
@@ -1465,6 +1467,51 @@ delete_window (window)
   /* Mark this window as deleted.  */
   p->buffer = p->hchild = p->vchild = Qnil;
 
+  if (! NILP (par->parent))
+    par = XWINDOW (par->parent);
+
+  /* Check if we have a v/hchild with a v/hchild.  In that case remove
+     one of them.  */
+  
+  if (! NILP (par->vchild) && ! NILP (XWINDOW (par->vchild)->vchild))
+    {
+      p = XWINDOW (par->vchild);
+      par->vchild = p->vchild;
+      tem = p->vchild;
+    }
+  else if (! NILP (par->hchild) && ! NILP (XWINDOW (par->hchild)->hchild))
+    {
+      p = XWINDOW (par->hchild);
+      par->hchild = p->hchild;
+      tem = p->hchild;
+    }
+  else
+    p = 0;
+
+  if (p)
+    {
+      while (! NILP (tem)) {
+        XWINDOW (tem)->parent = p->parent;
+        if (NILP (XWINDOW (tem)->next))
+          break;
+        tem = XWINDOW (tem)->next;
+      }
+      if (! NILP (tem)) {
+        /* The next of the v/hchild we are removing is now the next of the
+           last child for the v/hchild:
+           Before v/hchild -> v/hchild -> next1 -> next2
+                    |
+                     -> next3
+           After:  v/hchild -> next1 -> next2 -> next3
+        */
+        XWINDOW (tem)->next = p->next;
+        if (! NILP (p->next))
+          XWINDOW (p->next)->prev = tem;
+      }
+      p->next = p->prev = p->vchild = p->hchild = p->buffer = Qnil;
+    }
+
+
   /* Adjust glyph matrices. */
   adjust_glyphs (f);
   UNBLOCK_INPUT;
diff --git a/src/xdisp.c b/src/xdisp.c
index 6ad0bb9166a..54e6c7fe8f6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -351,6 +351,10 @@ Lisp_Object Qtrailing_whitespace;
 
 Lisp_Object Qescape_glyph;
 
+/* Name and number of the face used to highlight non-breaking spaces.  */
+
+Lisp_Object Qno_break_space;
+
 /* The symbol `image' which is the car of the lists used to represent
    images in Lisp.  */
 
@@ -5203,6 +5207,8 @@ get_next_display_element (it)
               int face_id, lface_id = 0 ;
               GLYPH escape_glyph;
 
+              /* Handle control characters with ^.  */
+
               if (it->c < 128 && it->ctl_arrow_p)
                 {
                   g = '^';           /* default glyph for Control */
@@ -5234,7 +5240,28 @@ get_next_display_element (it)
                   goto display_control;
                 }
 
-              escape_glyph = '\\';    /* default for Octal display */
+              /* Handle non-break space in the mode where it only gets
+                 highlighting.  */
+
+              if (! EQ (Vshow_nonbreak_escape, Qt)
+                  && (it->c == 0x8a0 || it->c == 0x920
+                      || it->c == 0xe20 || it->c == 0xf20))
+                {
+                  /* Merge the no-break-space face into the current face.  */
+                  face_id = merge_faces (it->f, Qno_break_space, 0,
+                                         it->face_id);
+
+                  g = it->c = ' ';
+                  XSETINT (it->ctl_chars[0], g);
+                  ctl_len = 1;
+                  goto display_control;
+                }
+
+              /* Handle sequences that start with the "escape glyph".  */
+
+              /* the default escape glyph is \.  */
+              escape_glyph = '\\';
+
               if (it->dp
                   && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
                   && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp))))
@@ -5244,6 +5271,8 @@ get_next_display_element (it)
                 }
               if (lface_id)
                 {
+                  /* The display table specified a face.
+                     Merge it into face_id and also into escape_glyph.  */
                   escape_glyph = FAST_GLYPH_CHAR (escape_glyph);
                   face_id = merge_faces (it->f, Qt, lface_id,
                                          it->face_id);
@@ -8552,7 +8581,7 @@ prepare_menu_bars ()
       Lisp_Object tail, frame;
       int count = SPECPDL_INDEX ();
 
-      record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
+      record_unwind_save_match_data ();
 
       FOR_EACH_FRAME (tail, frame)
         {
@@ -8675,7 +8704,7 @@ update_menu_bar (f, save_match_data)
 
           set_buffer_internal_1 (XBUFFER (w->buffer));
           if (save_match_data)
-            record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
+            record_unwind_save_match_data ();
           if (NILP (Voverriding_local_map_menu_flag))
             {
               specbind (Qoverriding_terminal_local_map, Qnil);
@@ -8866,7 +8895,7 @@ update_tool_bar (f, save_match_data)
 
           /* Save match data, if we must.  */
           if (save_match_data)
-            record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
+            record_unwind_save_match_data ();
 
           /* Make sure that we don't accidentally use bogus keymaps.  */
           if (NILP (Voverriding_local_map_menu_flag))
@@ -21620,10 +21649,8 @@ note_mode_line_or_margin_highlight (window, x, y, area)
           int total_pixel_width;
           int ignore;
 
-
-          if (clear_mouse_face (dpyinfo))
-            cursor = No_Cursor;
-
+          int vpos, hpos;
+          
           b = Fprevious_single_property_change (make_number (charpos + 1),
                                                 Qmouse_face, string, Qnil);
           if (NILP (b))
@@ -21666,15 +21693,30 @@ note_mode_line_or_margin_highlight (window, x, y, area)
           for (tmp_glyph = glyph - gpos; tmp_glyph != glyph; tmp_glyph++)
             total_pixel_width += tmp_glyph->pixel_width;
 
-          dpyinfo->mouse_face_beg_col = (x - gpos);
-          dpyinfo->mouse_face_beg_row = (area == ON_MODE_LINE
-                                         ? (w->current_matrix)->nrows - 1
-                                         : 0);
+          /* Pre calculation of re-rendering position */
+          vpos = (x - gpos);
+          hpos = (area == ON_MODE_LINE
+                  ? (w->current_matrix)->nrows - 1
+                  : 0);
+          
+          /* If the re-rendering position is included in the last
+             re-rendering area, we should do nothing. */
+          if ( window == dpyinfo->mouse_face_window
+               && dpyinfo->mouse_face_beg_col <= vpos
+               && vpos < dpyinfo->mouse_face_end_col
+               && dpyinfo->mouse_face_beg_row == hpos )
+            return;
+          
+          if (clear_mouse_face (dpyinfo))
+            cursor = No_Cursor;
+          
+          dpyinfo->mouse_face_beg_col = vpos;
+          dpyinfo->mouse_face_beg_row = hpos;
 
           dpyinfo->mouse_face_beg_x   = original_x_pixel - (total_pixel_width + dx);
           dpyinfo->mouse_face_beg_y   = 0;
 
-          dpyinfo->mouse_face_end_col = (x - gpos) + gseq_length;
+          dpyinfo->mouse_face_end_col = vpos + gseq_length;
           dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_beg_row;
 
           dpyinfo->mouse_face_end_x   = 0;
@@ -21746,7 +21788,8 @@ note_mouse_highlight (f, x, y)
   /* If we were displaying active text in another window, clear that.
      Also clear if we move out of text area in same window.  */
   if (! EQ (window, dpyinfo->mouse_face_window)
-      || (part != ON_TEXT && !NILP (dpyinfo->mouse_face_window)))
+      || (part != ON_TEXT && part != ON_MODE_LINE && part != ON_HEADER_LINE 
+          && !NILP (dpyinfo->mouse_face_window)))
     clear_mouse_face (dpyinfo);
 
   /* Not on a window -> return.  */
@@ -22861,6 +22904,8 @@ syms_of_xdisp ()
   staticpro (&Qtrailing_whitespace);
   Qescape_glyph = intern ("escape-glyph");
   staticpro (&Qescape_glyph);
+  Qno_break_space = intern ("no-break-space");
+  staticpro (&Qno_break_space);
   Qimage = intern ("image");
   staticpro (&Qimage);
   QCmap = intern (":map");
@@ -22967,7 +23012,11 @@ The face used for trailing whitespace is `trailing-whitespace'.  */);
   Vshow_trailing_whitespace = Qnil;
 
   DEFVAR_LISP ("show-nonbreak-escape", &Vshow_nonbreak_escape,
-    doc: /* *Non-nil means display escape character before non-break space and hyphen.  */);
+    doc: /* *Control highlighting of non-break space and soft hyphen.
+t means highlight the character itself (for non-break space,
+use face `non-break-space'.
+nil means no highlighting.
+other values mean display the escape glyph before the character.  */);
   Vshow_nonbreak_escape = Qt;
 
   DEFVAR_LISP ("void-text-area-pointer", &Vvoid_text_area_pointer,
diff --git a/src/xmenu.c b/src/xmenu.c
index 826c9330c46..a05c9793750 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1235,10 +1235,6 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers)
       if (event.type == ButtonRelease
           && dpyinfo->display == event.xbutton.display)
         {
-          /* If the click is not on the menu, deactivate the menu.  */
-          if (x_any_window_to_frame (dpyinfo, event.xexpose.window))
-            popup_activated_flag = 0;
-            
           dpyinfo->grabbed &= ~(1 << event.xbutton.button);
 #ifdef USE_MOTIF /* Pretending that the event came from a
                     Btn1Down seems the only way to convince Motif to
@@ -2034,7 +2030,7 @@ set_frame_menubar (f, first_time, deep_p)
          because it is not reentrant.  */
       specbind (Qdebug_on_next_call, Qnil);
 
-      record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
+      record_unwind_save_match_data ();
       record_unwind_protect (unuse_menu_items, Qnil);
       if (NILP (Voverriding_local_map_menu_flag))
         {
diff --git a/src/xterm.c b/src/xterm.c
index be61c15afdd..0a22930fb4f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4595,11 +4595,14 @@ x_create_toolkit_scroll_bar (f, bar)
     char *initial = "";
     char *val = initial;
     XtVaGetValues (widget, XtNscrollVCursor, (XtPointer) &val,
+#ifdef XtNarrowScrollbars
+                   XtNarrowScrollbars, (XtPointer) &xaw3d_arrow_scroll,
+#endif
                    XtNpickTop, (XtPointer) &xaw3d_pick_top, NULL);
-    if (val == initial)
+    if (xaw3d_arrow_scroll || val == initial)
       { /* ARROW_SCROLL */
         xaw3d_arrow_scroll = True;
-        /* Isn't that just a personal preference ?   -sm */
+        /* Isn't that just a personal preference ?   --Stef */
         XtVaSetValues (widget, XtNcursorName, "top_left_arrow", NULL);
       }
   }