Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-102
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-103
   Update from CVS: src/regex.c (extend_range_table_work_area): Fix typo.

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

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

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

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

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

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

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

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

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

10 files changed, 235 insertions, 153 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 18dcc803efa..f2a6e1e2752 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,66 @@
+2006-02-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * regex.c (extend_range_table_work_area): Fix typo.
+
+2006-02-19  Richard M. Stallman  <rms@gnu.org>
+
+        * xterm.c (x_catch_errors): Use xmalloc.
+
+        * regex.c (extend_range_table_work_area): Call xmalloc and xrealloc.
+        (regex_compile): Likewise.
+        (regcomp): Use xmalloc.
+
+        * gtkutil.c (malloc_widget_value): Use xmalloc.
+
+        * vm-limit.c [HAVE_GETRLIMIT]: Include sys/resource.h.
+        (check_memory_limits) [HAVE_GETRLIMIT]: Use getrlimit.
+
+        * xmenu.c (digest_single_submenu): When pane_string is empty,
+        do initialize save_wv.
+
+2006-02-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xdisp.c (update_menu_bar) [MAC_OS]: Don't set
+        w->update_mode_line if arg F is not the selected frame.
+
+        * macmenu.c (popup_activated_flag, submenu_id)
+        (next_menubar_widget_id): Remove variables.
+        (initialize_frame_menubar): Remove function.
+        (pop_down_menu, mac_menu_show): Simplify save value.
+        (dispose_menus): New function.
+        (pop_down_menu, fill_menubar): Use it.
+        (fill_submenu): Remove function.  All uses changed to fill_menu.
+        (add_menu_item): Remove args SUBMENU and FORCE_DISABLE.  New arg
+        POS.  Don't call SetMenuItemHierarchicalID here.
+        (fill_menu): Add arg SUBMENU_ID.  Return submenu_id that is to be
+        used next.  Call SetMenuItemHierarchicalID here.
+        (fill_menubar): Add arg DEEP_P.  All uses changed.  Clean up menu
+        objects if needed.  Reuse existing menu bar titles if possible.
+        (set_frame_menubar): Don't clean up menu objects here.
+
+2006-02-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.c (window_min_size_1): Ensure room for the scroll bar and
+        fringes.
+
+2006-02-17  Romain Francoise  <romain@orebokech.com>
+
+        * puresize.h (BASE_PURESIZE): Increment to 1200000.
+
+2006-02-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * alloc.c (Fmake_symbol): Comment-out left-over assert from before the
+        addition of the BLOCK_INPUTs.
+
+2006-02-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * window.c (Fset_window_scroll_bars): Doc fix.
+
+2006-02-17  Kenichi Handa  <handa@m17n.org>
+
+        * xdisp.c (display_mode_element): Call display_string with correct
+        PREC arg (which must be a number of characters, not column width).
+
 2006-02-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * frame.c (x_get_arg): Clear out PARAM in ALIST also on Mac.
diff --git a/src/alloc.c b/src/alloc.c
index 27fe3f86961..74c3c66173a 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3211,7 +3211,7 @@ Its value and function definition are void, and its property list is nil.  */)
 
   CHECK_STRING (name);
 
-  eassert (!handling_signal);
+  /* eassert (!handling_signal); */
 
 #ifndef SYNC_INPUT
   BLOCK_INPUT;
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 5b7a5166888..203eab257f3 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -199,7 +199,7 @@ malloc_widget_value ()
     }
   else
     {
-      wv = (widget_value *) malloc (sizeof (widget_value));
+      wv = (widget_value *) xmalloc (sizeof (widget_value));
       malloc_cpt++;
     }
   memset (wv, 0, sizeof (widget_value));
diff --git a/src/macmenu.c b/src/macmenu.c
index bd4ad6291cf..fccbbe6402c 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -189,8 +189,9 @@ static void single_keymap_panes P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
 static void list_of_panes P_ ((Lisp_Object));
 static void list_of_items P_ ((Lisp_Object));
 
-static void fill_submenu (MenuHandle, widget_value *);
-static void fill_menubar (widget_value *);
+static int fill_menu P_ ((MenuHandle, widget_value *, int));
+static void fill_menubar P_ ((widget_value *, int));
+static void dispose_menus P_ ((int));
 
 
 /* This holds a Lisp vector that holds the results of decoding
@@ -247,15 +248,6 @@ static int menu_items_n_panes;
 /* Current depth within submenus.  */
 static int menu_items_submenu_depth;
 
-/* Flag which when set indicates a dialog or menu has been posted by
-   Xt on behalf of one of the widget sets.  */
-static int popup_activated_flag;
-
-/* Index of the next submenu */
-static int submenu_id;
-
-static int next_menubar_widget_id;
-
 /* 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.
@@ -1440,7 +1432,7 @@ install_menu_quit_handler (MenuHandle menu_handle)
       menu = GetMenuHandle (++i);
     }
 
-  i = menu_handle ? MIN_POPUP_SUBMENU_ID : MIN_SUBMENU_ID;  
+  i = menu_handle ? MIN_POPUP_SUBMENU_ID : MIN_SUBMENU_ID;
   menu = GetMenuHandle (i);
   while (menu != NULL)
     {
@@ -1679,27 +1671,7 @@ set_frame_menubar (f, first_time, deep_p)
   /* Non-null value to indicate menubar has already been "created".  */
   f->output_data.mac->menubar_widget = 1;
 
-  {
-    int i = MIN_MENU_ID;
-    MenuHandle menu = GetMenuHandle (i);
-    while (menu != NULL)
-      {
-        DeleteMenu (i);
-        DisposeMenu (menu);
-        menu = GetMenuHandle (++i);
-      }
-
-    i = MIN_SUBMENU_ID;
-    menu = GetMenuHandle (i);
-    while (menu != NULL)
-      {
-        DeleteMenu (i);
-        DisposeMenu (menu);
-        menu = GetMenuHandle (++i);
-      }
-  }
-
-  fill_menubar (first_wv->contents);
+  fill_menubar (first_wv->contents, deep_p);
 
   /* Add event handler so we can detect C-g. */
   install_menu_quit_handler (NULL);
@@ -1708,22 +1680,6 @@ set_frame_menubar (f, first_time, deep_p)
   UNBLOCK_INPUT;
 }
 
-/* Called from Fx_create_frame to create the initial menubar of a frame
-   before it is mapped, so that the window is mapped with the menubar already
-   there instead of us tacking it on later and thrashing the window after it
-   is visible.  */
-
-void
-initialize_frame_menubar (f)
-     FRAME_PTR f;
-{
-  /* This function is called before the first chance to redisplay
-     the frame.  It has to be, so the frame will have the right size.  */
-  FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
-  set_frame_menubar (f, 1, 1);
-}
-
-
 /* Get rid of the menu bar of frame F, and free its storage.
    This is used when deleting a frame, and when turning off the menu bar.  */
 
@@ -1739,11 +1695,9 @@ 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;
+  struct Lisp_Save_Value *p = XSAVE_VALUE (arg);
+  FRAME_PTR f = p->pointer;
+  MenuHandle menu = GetMenuHandle (POPUP_SUBMENU_ID);
 
   BLOCK_INPUT;
 
@@ -1752,19 +1706,9 @@ pop_down_menu (arg)
   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);
-      }
-  }
-
+  dispose_menus (MIN_POPUP_SUBMENU_ID);
   DeleteMenu (POPUP_SUBMENU_ID);
-  DisposeMenu (*menu);
+  DisposeMenu (menu);
 
   UNBLOCK_INPUT;
 
@@ -1998,8 +1942,8 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
 
   /* Actually create the menu.  */
   menu = NewMenu (POPUP_SUBMENU_ID, "\p");
-  submenu_id = MIN_POPUP_SUBMENU_ID;
-  fill_submenu (menu, first_wv->contents);
+  InsertMenu (menu, -1);
+  fill_menu (menu, first_wv->contents, MIN_POPUP_SUBMENU_ID);
 
   /* Free the widget_value objects we used to specify the
      contents.  */
@@ -2016,11 +1960,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   menu_item_choice = 0;
   menu_item_selection = 0;
 
-  InsertMenu (menu, -1);
-
-  record_unwind_protect (pop_down_menu,
-                         Fcons (make_save_value (f, 0),
-                                make_save_value (&menu, 0)));
+  record_unwind_protect (pop_down_menu, make_save_value (f, 0));
 
   /* Add event handler so we can detect C-g. */
   install_menu_quit_handler (menu);
@@ -2421,15 +2361,16 @@ name_is_separator (name)
 }
 
 static void
-add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
-               int force_disable)
+add_menu_item (menu, pos, wv)
+     MenuHandle menu;
+     int pos;
+     widget_value *wv;
 {
 #if TARGET_API_MAC_CARBON
   CFStringRef item_name;
 #else
   Str255 item_name;
 #endif
-  int pos;
 
   if (name_is_separator (wv->name))
     AppendMenu (menu, "\p-");
@@ -2438,8 +2379,6 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
       AppendMenu (menu, "\pX");
 
 #if TARGET_API_MAC_CARBON
-      pos = CountMenuItems (menu);
-
       item_name = cfstring_create_with_utf8_cstring (wv->name);
 
       if (wv->key != NULL)
@@ -2457,13 +2396,11 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
       SetMenuItemTextWithCFString (menu, pos, item_name);
       CFRelease (item_name);
 
-      if (wv->enabled && !force_disable)
+      if (wv->enabled)
         EnableMenuItem (menu, pos);
       else
         DisableMenuItem (menu, pos);
 #else  /* ! TARGET_API_MAC_CARBON */
-      pos = CountMItems (menu);
-
       item_name[sizeof (item_name) - 1] = '\0';
       strncpy (item_name, wv->name, sizeof (item_name) - 1);
       if (wv->key != NULL)
@@ -2477,88 +2414,140 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
       c2pstr (item_name);
       SetMenuItemText (menu, pos, item_name);
 
-      if (wv->enabled && !force_disable)
+      if (wv->enabled)
         EnableItem (menu, pos);
       else
         DisableItem (menu, pos);
 #endif  /* ! TARGET_API_MAC_CARBON */
 
       /* Draw radio buttons and tickboxes. */
-      {
       if (wv->selected && (wv->button_type == BUTTON_TYPE_TOGGLE ||
                            wv->button_type == BUTTON_TYPE_RADIO))
         SetItemMark (menu, pos, checkMark);
       else
         SetItemMark (menu, pos, noMark);
-      }
 
       SetMenuItemRefCon (menu, pos, (UInt32) wv->call_data);
     }
-
-  if (submenu != 0)
-    SetMenuItemHierarchicalID (menu, pos, submenu);
 }
 
-/* Construct native Mac OS menubar based on widget_value tree.  */
+/* Construct native Mac OS menu based on widget_value tree.  */
 
-static void
-fill_submenu (MenuHandle menu, widget_value *wv)
+static int
+fill_menu (menu, wv, submenu_id)
+     MenuHandle menu;
+     widget_value *wv;
+     int submenu_id;
 {
-  for ( ; wv != NULL; wv = wv->next)
-    if (wv->contents)
-      {
-        int cur_submenu = submenu_id++;
-        MenuHandle submenu = NewMenu (cur_submenu, "\pX");
-        fill_submenu (submenu, wv->contents);
-        InsertMenu (submenu, -1);
-        add_menu_item (menu, wv, cur_submenu, 0);
-      }
-    else
-      add_menu_item (menu, wv, 0, 0);
-}
+  int pos;
 
+  for (pos = 1; wv != NULL; wv = wv->next, pos++)
+    {
+      add_menu_item (menu, pos, wv);
+      if (wv->contents)
+        {
+          MenuHandle submenu = NewMenu (submenu_id, "\pX");
 
-/* Construct native Mac OS menu based on widget_value tree.  */
+          InsertMenu (submenu, -1);
+          SetMenuItemHierarchicalID (menu, pos, submenu_id);
+          submenu_id = fill_menu (submenu, wv->contents, submenu_id + 1);
+        }
+    }
 
-static void
-fill_menu (MenuHandle menu, widget_value *wv)
-{
-  for ( ; wv != NULL; wv = wv->next)
-    if (wv->contents)
-      {
-        int cur_submenu = submenu_id++;
-        MenuHandle submenu = NewMenu (cur_submenu, "\pX");
-        fill_submenu (submenu, wv->contents);
-        InsertMenu (submenu, -1);
-        add_menu_item (menu, wv, cur_submenu, 0);
-      }
-    else
-      add_menu_item (menu, wv, 0, 0);
+  return submenu_id;
 }
 
 /* Construct native Mac OS menubar based on widget_value tree.  */
 
 static void
-fill_menubar (widget_value *wv)
+fill_menubar (wv, deep_p)
+     widget_value *wv;
+     int deep_p;
 {
-  int id;
+  int id, submenu_id;
+  MenuHandle menu;
+  Str255 title;
+#if !TARGET_API_MAC_CARBON
+  int title_changed_p = 0;
+#endif
 
-  submenu_id  = MIN_SUBMENU_ID;
+  /* Clean up the menu bar when filled by the entire menu trees.  */
+  if (deep_p)
+    {
+      dispose_menus (MIN_MENU_ID);
+      dispose_menus (MIN_SUBMENU_ID);
+#if !TARGET_API_MAC_CARBON
+      title_changed_p = 1;
+#endif
+    }
 
+  /* Fill menu bar titles and submenus.  Reuse the existing menu bar
+     titles as much as possible to minimize redraw (if !deep_p).  */
+  submenu_id = MIN_SUBMENU_ID;
   for (id = MIN_MENU_ID; wv != NULL; wv = wv->next, id++)
     {
-      MenuHandle menu;
-      Str255 title;
-
       strncpy (title, wv->name, 255);
-      title[255] = 0;
+      title[255] = '\0';
       c2pstr (title);
-      menu = NewMenu (id, title);
+
+      menu = GetMenuHandle (id);
+      if (menu)
+        {
+#if TARGET_API_MAC_CARBON
+          Str255 old_title;
+
+          GetMenuTitle (menu, old_title);
+          if (!EqualString (title, old_title, false, false))
+            SetMenuTitle (menu, title);
+#else  /* !TARGET_API_MAC_CARBON */
+          if (!EqualString (title, (*menu)->menuData, false, false))
+            {
+              DeleteMenu (id);
+              DisposeMenu (menu);
+              menu = NewMenu (id, title);
+              InsertMenu (menu, GetMenuHandle (id + 1) ? id + 1 : 0);
+              title_changed_p = 1;
+            }
+#endif  /* !TARGET_API_MAC_CARBON */
+        }
+      else
+        {
+          menu = NewMenu (id, title);
+          InsertMenu (menu, 0);
+#if !TARGET_API_MAC_CARBON
+          title_changed_p = 1;
+#endif
+        }
 
       if (wv->contents)
-        fill_menu (menu, wv->contents);
+        submenu_id = fill_menu (menu, wv->contents, submenu_id);
+    }
 
-      InsertMenu (menu, 0);
+  if (GetMenuHandle (id))
+    {
+      dispose_menus (id);
+#if !TARGET_API_MAC_CARBON
+      title_changed_p = 1;
+#endif
+    }
+
+#if !TARGET_API_MAC_CARBON
+  if (title_changed_p)
+    InvalMenuBar ();
+#endif
+}
+
+static void
+dispose_menus (id)
+     int id;
+{
+  MenuHandle menu;
+
+  while ((menu = GetMenuHandle (id)) != NULL)
+    {
+      DeleteMenu (id);
+      DisposeMenu (menu);
+      id++;
     }
 }
 
diff --git a/src/regex.c b/src/regex.c
index 60231826380..c08471355fd 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -2067,10 +2067,10 @@ extend_range_table_work_area (work_area)
   work_area->allocated += 16 * sizeof (int);
   if (work_area->table)
     work_area->table
-      = (int *) realloc (work_area->table, work_area->allocated);
+      = (int *) xrealloc (work_area->table, work_area->allocated);
   else
     work_area->table
-      = (int *) malloc (work_area->allocated);
+      = (int *) xmalloc (work_area->allocated);
 }
 
 #ifdef emacs
@@ -3608,13 +3608,13 @@ regex_compile (pattern, size, syntax, bufp)
 
         if (! fail_stack.stack)
           fail_stack.stack
-            = (fail_stack_elt_t *) malloc (fail_stack.size
-                                           * sizeof (fail_stack_elt_t));
+            = (fail_stack_elt_t *) xmalloc (fail_stack.size
+                                            * sizeof (fail_stack_elt_t));
         else
           fail_stack.stack
-            = (fail_stack_elt_t *) realloc (fail_stack.stack,
-                                            (fail_stack.size
-                                             * sizeof (fail_stack_elt_t)));
+            = (fail_stack_elt_t *) xrealloc (fail_stack.stack,
+                                             (fail_stack.size
+                                              * sizeof (fail_stack_elt_t)));
       }
 
     regex_grow_registers (num_regs);
@@ -6292,15 +6292,15 @@ regcomp (preg, pattern, cflags)
   preg->used = 0;
 
   /* Try to allocate space for the fastmap.  */
-  preg->fastmap = (char *) malloc (1 << BYTEWIDTH);
+  preg->fastmap = (char *) xmalloc (1 << BYTEWIDTH);
 
   if (cflags & REG_ICASE)
     {
       unsigned i;
 
       preg->translate
-        = (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE
-                                      * sizeof (*(RE_TRANSLATE_TYPE)0));
+        = (RE_TRANSLATE_TYPE) xmalloc (CHAR_SET_SIZE
+                                       * sizeof (*(RE_TRANSLATE_TYPE)0));
       if (preg->translate == NULL)
         return (int) REG_ESPACE;
 
diff --git a/src/vm-limit.c b/src/vm-limit.c
index fb127b27b74..48d13c323ae 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -33,6 +33,10 @@ typedef void *POINTER;
 
 #include "mem-limits.h"
 
+#ifdef HAVE_GETRLIMIT
+#include <sys/resource.h>
+#endif
+
 /*
   Level number of warnings already issued.
   0 -- no warnings issued.
@@ -61,6 +65,19 @@ check_memory_limits ()
   unsigned long five_percent;
   unsigned long data_size;
 
+#ifdef HAVE_GETRLIMIT
+  struct rlimit {
+    rlim_t rlim_cur;
+    rlim_t rlim_max;
+  } rlimit;
+
+  getrlimit (RLIMIT_DATA, &rlimit);
+
+  five_percent = rlimit.rlim_max / 20;
+  data_size = rlimit.rlim_cur;
+
+#else /* not HAVE_GETRLIMIT */
+
   if (lim_data == 0)
     get_lim_data ();
   five_percent = lim_data / 20;
@@ -74,6 +91,8 @@ check_memory_limits ()
   cp = (char *) (*__morecore) (0);
   data_size = (char *) cp - (char *) data_space_start;
 
+#endif /* not HAVE_GETRLIMIT */
+
   if (warn_function)
     switch (warnlevel)
       {
diff --git a/src/window.c b/src/window.c
index 58ab3ee14a0..350b4753491 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2570,7 +2570,10 @@ window_min_size_1 (w, width_p)
   else
     {
       if (width_p)
-        size = window_min_width;
+        size = max (window_min_width,
+                    (MIN_SAFE_WINDOW_WIDTH
+                     + WINDOW_FRINGE_COLS (w)
+                     + WINDOW_SCROLL_BAR_COLS (w)));
       else
         {
           if (MINI_WINDOW_P (w)
@@ -4288,7 +4291,7 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
             {
               /* This may happen for the minibuffer.  In that case
                  the window_deletion_count check below does not work.  */
-              if (XINT (CURSIZE (p->next)) - delta <= 0) 
+              if (XINT (CURSIZE (p->next)) - delta <= 0)
                 {
                   Fset_window_configuration (old_config);
                   error ("Cannot adjust window size as specified");
@@ -6602,7 +6605,8 @@ this is automatically adjusted to a multiple of the frame column width.
 Third parameter VERTICAL-TYPE specifies the type of the vertical scroll
 bar: left, right, or nil.
 If WIDTH is nil, use the frame's scroll-bar width.
-If TYPE is t, use the frame's scroll-bar type.  */)
+If VERTICAL-TYPE is t, use the frame's scroll-bar type.
+Fourth parameter HORIZONTAL-TYPE is currently unused.  */)
      (window, width, vertical_type, horizontal_type)
      Lisp_Object window, width, vertical_type, horizontal_type;
 {
diff --git a/src/xdisp.c b/src/xdisp.c
index 9efa1c60cbc..1361607010a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9057,14 +9057,15 @@ update_menu_bar (f, save_match_data)
           /* Redisplay the menu bar in case we changed it.  */
 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \
     || defined (USE_GTK)
-          if (FRAME_WINDOW_P (f)
-#if defined (MAC_OS)
-              /* All frames on Mac OS share the same menubar.  So only the
-                 selected frame should be allowed to set it.  */
-              && f == SELECTED_FRAME ()
+          if (FRAME_WINDOW_P (f))
+            {
+#ifdef MAC_OS
+              /* All frames on Mac OS share the same menubar.  So only
+                 the selected frame should be allowed to set it.  */
+              if (f == SELECTED_FRAME ())
 #endif
-             )
-            set_frame_menubar (f, 0, 0);
+                set_frame_menubar (f, 0, 0);
+            }
           else
             /* On a terminal screen, the menu bar is an ordinary screen
                line, and this makes it get updated.  */
@@ -16492,8 +16493,11 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
                     {
                       int bytepos = last_offset;
                       int charpos = string_byte_to_char (elt, bytepos);
+
+                      if (precision <= 0)
+                        nchars = string_byte_to_char (elt, offset) - charpos;
                       n += display_string (NULL, elt, Qnil, 0, charpos,
-                                           it, 0, prec, 0,
+                                           it, 0, nchars, 0,
                                            STRING_MULTIBYTE (elt));
                     }
                     break;
@@ -17742,7 +17746,7 @@ display_count_lines (start, start_byte, limit_byte, count, byte_pos_ptr)
    display them, and < 0 means obey the current buffer's value of
    enable_multibyte_characters.
 
-   Value is the number of glyphs produced.  */
+   Value is the number of columns displayed.  */
 
 static int
 display_string (string, lisp_string, face_string, face_string_pos,
diff --git a/src/xmenu.c b/src/xmenu.c
index ddb93aa8c77..3c8c6d81a37 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1819,8 +1819,11 @@ digest_single_submenu (start, end, top_level_items)
               wv->enabled = 1;
               wv->button_type = BUTTON_TYPE_NONE;
               wv->help = Qnil;
+              save_wv = wv;
             }
-          save_wv = wv;
+          else
+            save_wv = first_wv;
+
           prev_wv = 0;
           i += MENU_ITEMS_PANE_LENGTH;
         }
diff --git a/src/xterm.c b/src/xterm.c
index 86e780cc611..1b1dbdda552 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7527,7 +7527,7 @@ x_catch_errors (dpy)
      Display *dpy;
 {
   int count = SPECPDL_INDEX ();
-  struct x_error_message_stack *data = malloc (sizeof (*data));
+  struct x_error_message_stack *data = xmalloc (sizeof (*data));
   Lisp_Object dummy;
 #ifdef ENABLE_CHECKING
   dummy = make_number ((EMACS_INT)dpy + (EMACS_INT)x_error_message);