Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-34

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-514
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-522
   Update from CVS

13 files changed, 533 insertions, 236 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index aa3721d9106..8fd72a29c29 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,89 @@
+2004-09-03  Jason Rumney  <jasonr@gnu.org>
+
+        * w32menu.c (_widget_value): Added lname and lkey.
+        (digest_single_submenu): Set lname and lkey in widget_value
+        instead of name and key.
+        (update_submenu_strings): New function.
+        (set_frame_menubar): Remove call to inhibit_garbage_collection,
+        call update_submenu_strings.
+
+        * w32menu.c (globals_of_w32menu): Check for Unicode API.
+        (digest_single_submenu, w32_menu_show): Encode menu strings as
+        UTF-8 if Unicode API is available.
+        (utf8to16): New function.
+        (add_menu_item): Use it when calling Unicode API.
+        
+2004-09-03  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (set_cursor_from_row): Look for non-nil `cursor' property
+        in overlay or text-property strings; set cursor on corresponding
+        glyph rather than at end of the string.
+
+2004-09-02  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (x_real_positions): Save the current window port and
+        set a new one before obtaining the global coordinate.  Use
+        FRAME_MAC_WINDOW.
+        (x_set_name, x_set_title): Encode title to UTF8.  Use
+        SetWindowTitleWithCFString.
+        (Fx_server_version): Get correct OS version.
+
+        * macmenu.c (add_menu_item): Remove unused variable `i'.  Don't
+        let separator items destroy refence constants of other menu items.
+
+        * macterm.c (x_update_end): Move SetPortWindowPort to inside
+        BLOCK_INPUT.
+        (x_set_offset): Use FRAME_MAC_WINDOW.
+
+        * xdisp.c (note_mouse_highlight): Set the mouse pointer shape to
+        nontext_cursor if it is on a scroll bar.
+
+        * s/darwin.h (LIBS_CARBON): New define to specify libraries for
+        Carbon support.
+        (LD_SWITCH_SYSTEM_TEMACS): Don't link with unused libstdc++.  Use
+        LIBS_CARBON.
+
+2004-09-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xfns.c (x_set_name_internal): New function.  Check if we shall call
+        xfree before ENCODE_UTF_8.
+        (x_set_name, x_set_title): Call x_set_name_internal.
+
+2004-08-31  NAKAMURA Toshikazu  <nr-tkz@nifty.com>  (tiny change)
+
+        * w32fns.c (w32_load_font): If a BDF font is already loaded, do not
+        reload it.
+
+2004-08-30  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * macmenu.c (_widget_value): Added lname and lkey.
+        (single_submenu): Set lname and lkey in widget_value
+        instead of name and key.
+        (update_submenu_strings): New function.
+        (set_frame_menubar): Remove call to inhibit_garbage_collection,
+        call update_submenu_strings.
+
+        * xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
+        instead of name and key.
+        (update_submenu_strings): New function.
+        (set_frame_menubar): Remove call to inhibit_garbage_collection,
+        call update_submenu_strings.
+
+        * gtkutil.h (_widget_value): Added lname and lkey.
+
+2004-08-30  Steven Tamm  <steventamm@mac.com>
+
+        * macmenu.c (mac_menu_show): Remove shadowing of menu variable
+        by using different names for inner loop variables.
+
+2004-08-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection
+        from 2002-07-15T00:01:34Z!raeburn@raeburn.org so that strings from ENCODE_UTF_8 isn't GC:ed before used.
+
+        * gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
+        tool bar items is 0.
+
 2004-08-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte
diff --git a/src/fileio.c b/src/fileio.c
index 66b7d8b83fc..8290f01b58e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6217,7 +6217,7 @@ and `read-file-name-function'.  */)
 
   GCPRO2 (insdef, default_filename);
 
-#if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) || defined(TARGET_API_MAC_CARBON)
+#if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) || defined (TARGET_API_MAC_CARBON)
   if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
       && use_dialog_box
       && use_file_dialog
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 3ffba0ba745..fabdae74dc6 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -793,7 +793,7 @@ xg_create_frame_widgets (f)
      up in the wrong place as tool bar height has not been taken into account.
      So we cheat a bit by setting a height that is what it will have
      later on when tool bar items are added.  */
-  if (FRAME_EXTERNAL_TOOL_BAR (f) && FRAME_TOOLBAR_HEIGHT (f) == 0)
+  if (FRAME_EXTERNAL_TOOL_BAR (f) && f->n_tool_bar_items == 0)
     FRAME_TOOLBAR_HEIGHT (f) = 34;
 
 
diff --git a/src/gtkutil.h b/src/gtkutil.h
index b31ec8c2a1f..b35ab94b2cb 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -96,10 +96,12 @@ typedef struct xg_menu_item_cb_data_
 typedef struct _widget_value
 {
   /* name of widget */
+  Lisp_Object   lname;
   char          *name;
   /* value (meaning depend on widget type) */
   char          *value;
   /* keyboard equivalent. no implications for XtTranslations */
+  Lisp_Object   lkey;
   char          *key;
   /* Help string or nil if none.
      GC finds this string through the frame's menu_bar_vector
diff --git a/src/macfns.c b/src/macfns.c
index fbade05ea17..3b09b344a55 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -324,19 +324,21 @@ x_real_positions (f, xptr, yptr)
   Point pt;
   GrafPtr oldport;
 
-#ifdef TARGET_API_MAC_CARBON
+  GetPort (&oldport);
+  SetPortWindowPort (FRAME_MAC_WINDOW (f));
+
+#if TARGET_API_MAC_CARBON
   {
     Rect r;
 
-    GetWindowPortBounds (f->output_data.mac->mWP, &r);
+    GetWindowPortBounds (FRAME_MAC_WINDOW (f), &r);
     SetPt (&pt, r.left, r.top);
   }
 #else /* not TARGET_API_MAC_CARBON */
   SetPt (&pt,
-         f->output_data.mac->mWP->portRect.left,
-         f->output_data.mac->mWP->portRect.top);
+         FRAME_MAC_WINDOW (f)->portRect.left,
+         FRAME_MAC_WINDOW (f)->portRect.top);
 #endif /* not TARGET_API_MAC_CARBON */
-  GetPort (&oldport);
   LocalToGlobal (&pt);
   SetPort (oldport);
 
@@ -1934,8 +1936,8 @@ x_set_name (f, name, explicit)
   if (FRAME_MAC_WINDOW (f))
     {
       if (STRING_MULTIBYTE (name))
-#if 0 /* MAC_TODO: encoding title string */
-        name = ENCODE_SYSTEM (name);
+#if TARGET_API_MAC_CARBON
+        name = ENCODE_UTF_8 (name);
 #else
         return;
 #endif
@@ -1943,6 +1945,14 @@ x_set_name (f, name, explicit)
       BLOCK_INPUT;
 
       {
+#if TARGET_API_MAC_CARBON
+        CFStringRef windowTitle =
+          CFStringCreateWithCString (NULL, SDATA (name),
+                                     kCFStringEncodingUTF8);
+
+        SetWindowTitleWithCFString (FRAME_MAC_WINDOW (f), windowTitle);
+        CFRelease (windowTitle);
+#else
         Str255 windowTitle;
         if (strlen (SDATA (name)) < 255)
           {
@@ -1950,6 +1960,7 @@ x_set_name (f, name, explicit)
             c2pstr (windowTitle);
             SetWTitle (FRAME_MAC_WINDOW (f), windowTitle);
           }
+#endif
       }
 
       UNBLOCK_INPUT;
@@ -2008,8 +2019,8 @@ x_set_title (f, name, old_name)
   if (FRAME_MAC_WINDOW (f))
     {
       if (STRING_MULTIBYTE (name))
-#if 0 /* MAC_TODO: encoding title string */
-        name = ENCODE_SYSTEM (name);
+#if TARGET_API_MAC_CARBON
+        name = ENCODE_UTF_8 (name);
 #else
         return;
 #endif
@@ -2017,6 +2028,14 @@ x_set_title (f, name, old_name)
       BLOCK_INPUT;
 
       {
+#if TARGET_API_MAC_CARBON
+        CFStringRef windowTitle =
+          CFStringCreateWithCString (NULL, SDATA (name),
+                                     kCFStringEncodingUTF8);
+
+        SetWindowTitleWithCFString (FRAME_MAC_WINDOW (f), windowTitle);
+        CFRelease (windowTitle);
+#else
         Str255 windowTitle;
         if (strlen (SDATA (name)) < 255)
           {
@@ -2024,6 +2043,7 @@ x_set_title (f, name, old_name)
             c2pstr (windowTitle);
             SetWTitle (FRAME_MAC_WINDOW (f), windowTitle);
           }
+#endif
       }
 
       UNBLOCK_INPUT;
@@ -2981,17 +3001,20 @@ If omitted or nil, that stands for the selected frame's display.  */)
   (display)
      Lisp_Object display;
 {
-  int mac_major_version, mac_minor_version;
+  int mac_major_version;
   SInt32 response;
 
   if (Gestalt (gestaltSystemVersion, &response) != noErr)
     error ("Cannot get Mac OS version");
 
-  mac_major_version = (response >> 8) & 0xf;
-  mac_minor_version = (response >> 4) & 0xf;
+  mac_major_version = (response >> 8) & 0xff;
+  /* convert BCD to int */
+  mac_major_version -= (mac_major_version >> 4) * 6;
 
   return Fcons (make_number (mac_major_version),
-                Fcons (make_number (mac_minor_version), Qnil));
+                Fcons (make_number ((response >> 4) & 0xf),
+                       Fcons (make_number (response & 0xf),
+                              Qnil)));
 }
 
 DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0,
diff --git a/src/macmenu.c b/src/macmenu.c
index 67e18481a1b..740bda261d8 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -90,10 +90,12 @@ enum button_type
 typedef struct _widget_value
 {
   /* name of widget */
+  Lisp_Object   lname;
   char*         name;
   /* value (meaning depend on widget type) */
   char*         value;
   /* keyboard equivalent. no implications for XtTranslations */
+  Lisp_Object   lkey;
   char*         key;
   /* Help string or nil if none.
      GC finds this string through the frame's menu_bar_vector
@@ -1221,12 +1223,9 @@ single_submenu (item_key, item_name, maps)
                 save_wv->next = wv;
               else
                 first_wv->contents = wv;
-              wv->name = pane_string;
-              /* Ignore the @ that means "separate pane".
-                 This is a kludge, but this isn't worth more time.  */
-              if (!NILP (prefix) && wv->name[0] == '@')
-                wv->name++;
-              wv->value = 0;
+              wv->lname = pane_name;
+              /* Set value to 1 so update_submenu_strings can handle '@'  */
+              wv->value = (char *)1;
               wv->enabled = 1;
               wv->button_type = BUTTON_TYPE_NONE;
               wv->help = Qnil;
@@ -1269,9 +1268,9 @@ single_submenu (item_key, item_name, maps)
           else
             save_wv->contents = wv;
 
-          wv->name = (char *) SDATA (item_name);
+          wv->lname = item_name;
           if (!NILP (descrip))
-            wv->key = (char *) SDATA (descrip);
+            wv->lkey = descrip;
           wv->value = 0;
           /* The EMACS_INT cast avoids a warning.  There's no problem
              as long as pointers have enough bits to hold small integers.  */
@@ -1310,6 +1309,41 @@ single_submenu (item_key, item_name, maps)
 
   return first_wv;
 }
+/* Walk through the widget_value tree starting at FIRST_WV and update
+   the char * pointers from the corresponding lisp values.
+   We do this after building the whole tree, since GC may happen while the
+   tree is constructed, and small strings are relocated.  So we must wait
+   until no GC can happen before storing pointers into lisp values.  */
+static void
+update_submenu_strings (first_wv)
+     widget_value *first_wv;
+{
+  widget_value *wv;
+
+  for (wv = first_wv; wv; wv = wv->next)
+    {
+      if (wv->lname && ! NILP (wv->lname))
+        {
+          wv->name = SDATA (wv->lname);
+
+          /* Ignore the @ that means "separate pane".
+             This is a kludge, but this isn't worth more time.  */
+          if (wv->value == (char *)1)
+            {
+              if (wv->name[0] == '@')
+                wv->name++;
+              wv->value = 0;
+            }
+        }
+
+      if (wv->lkey && ! NILP (wv->lkey))
+        wv->key = SDATA (wv->lkey);
+
+      if (wv->contents)
+        update_submenu_strings (wv->contents);
+    }
+}
+
 
 /* Set the contents of the menubar widgets of frame F.
    The argument FIRST_TIME is currently ignored;
@@ -1388,8 +1422,6 @@ set_frame_menubar (f, first_time, deep_p)
 
       items = FRAME_MENU_BAR_ITEMS (f);
 
-      inhibit_garbage_collection ();
-
       /* Save the frame's previous menu bar contents data.  */
       if (previous_menu_items_used)
         bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items,
@@ -1454,6 +1486,7 @@ set_frame_menubar (f, first_time, deep_p)
           if (NILP (string))
             break;
           wv->name = (char *) SDATA (string);
+          update_submenu_strings (wv->contents);
           wv = wv->next;
         }
 
@@ -1807,9 +1840,9 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   /* Get the refcon to find the correct item*/
   if (menu_item_selection)
     {
-      menu = GetMenuHandle (HiWord (menu_item_choice));
-      if (menu) {
-        GetMenuItemRefCon (menu, menu_item_selection, &refcon);
+      MenuHandle sel_menu = GetMenuHandle (HiWord (menu_item_choice));
+      if (sel_menu) {
+        GetMenuItemRefCon (sel_menu, menu_item_selection, &refcon);
       }
     }
 
@@ -1831,11 +1864,11 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   {
     int i = MIN_POPUP_SUBMENU_ID;
     MenuHandle submenu = GetMenuHandle (i);
-    while (menu != NULL)
+    while (submenu != NULL)
       {
         DeleteMenu (i);
-        DisposeMenu (menu);
-        menu = GetMenuHandle (++i);
+        DisposeMenu (submenu);
+        submenu = GetMenuHandle (++i);
       }
   }
 
@@ -2207,7 +2240,7 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
                int force_disable)
 {
   Str255 item_name;
-  int pos, i;
+  int pos;
 
   if (name_is_separator (wv->name))
     AppendMenu (menu, "\p-");
@@ -2263,9 +2296,9 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
       else
         SetItemMark (menu, pos, noMark);
       }
-    }
 
-  SetMenuItemRefCon (menu, pos, (UInt32) wv->call_data);
+      SetMenuItemRefCon (menu, pos, (UInt32) wv->call_data);
+    }
 
   if (submenu != NULL)
     SetMenuItemHierarchicalID (menu, pos, submenu);
diff --git a/src/macterm.c b/src/macterm.c
index 297683f6d9b..e1b8d49ddfa 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -1327,6 +1327,10 @@ static void
 x_update_end (f)
      struct frame *f;
 {
+  /* Mouse highlight may be displayed again.  */
+  FRAME_MAC_DISPLAY_INFO (f)->mouse_face_defer = 0;
+
+  BLOCK_INPUT;
   /* Reset the background color of Mac OS Window to that of the frame after
      update so that it is used by Mac Toolbox to clear the update region before
      an update event is generated.  */
@@ -1334,10 +1338,6 @@ x_update_end (f)
 
   mac_set_backcolor (FRAME_BACKGROUND_PIXEL (f));
 
-  /* Mouse highlight may be displayed again.  */
-  FRAME_MAC_DISPLAY_INFO (f)->mouse_face_defer = 0;
-
-  BLOCK_INPUT;
   XFlush (FRAME_MAC_DISPLAY (f));
   UNBLOCK_INPUT;
 }
@@ -5140,7 +5140,7 @@ x_set_offset (f, xoff, yoff, change_gravity)
   modified_left = f->left_pos;
   modified_top = f->top_pos;
 
-  MoveWindow (f->output_data.mac->mWP, modified_left + 6,
+  MoveWindow (FRAME_MAC_WINDOW (f), modified_left + 6,
               modified_top + 42, false);
 
   UNBLOCK_INPUT;
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 814de2c2c51..f854ed9380b 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -243,11 +243,18 @@ Boston, MA 02111-1307, USA.  */
    specific headers.  */
 #define C_SWITCH_SYSTEM -fpascal-strings -fno-common -DMAC_OSX -I../mac/src
 
-/* Link in the Carbon lib.  The -headerpad option tells ld (see man
-   page) to leave room at the end of the header for adding load
-   commands.  Needed for dumping.  0x690 is the total size of 30
-   segment load commands (at 56 each).  */
-#define LD_SWITCH_SYSTEM_TEMACS -prebind -framework Carbon -framework QuickTime -lstdc++ -Xlinker -headerpad -Xlinker 690
+/* Link in the Carbon lib. */
+#ifdef HAVE_CARBON
+#define LIBS_CARBON -framework Carbon -framework QuickTime
+#else
+#define LIBS_CARBON -framework Carbon
+#endif
+
+/* The -headerpad option tells ld (see man page) to leave room at the
+   end of the header for adding load commands.  Needed for dumping.
+   0x690 is the total size of 30 segment load commands (at 56
+   each).  */
+#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_CARBON -Xlinker -headerpad -Xlinker 690
 
 #define C_SWITCH_SYSTEM_TEMACS -Dtemacs
 
diff --git a/src/w32fns.c b/src/w32fns.c
index 3599078b3a3..d2231772bf4 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4644,6 +4644,7 @@ int size;
 {
   Lisp_Object bdf_fonts;
   struct font_info *retval = NULL;
+  struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f);
 
   bdf_fonts = w32_list_bdf_fonts (build_string (fontname), 1);
 
@@ -4651,11 +4652,22 @@ int size;
     {
       char *bdf_name, *bdf_file;
       Lisp_Object bdf_pair;
+      int i;
 
       bdf_name = SDATA (XCAR (bdf_fonts));
       bdf_pair = Fassoc (XCAR (bdf_fonts), Vw32_bdf_filename_alist);
       bdf_file = SDATA (XCDR (bdf_pair));
 
+      // If the font is already loaded, do not load it again.
+      for (i = 0; i < dpyinfo->n_fonts; i++)
+        {
+          if ((dpyinfo->font_table[i].name
+               && !strcmp (dpyinfo->font_table[i].name, bdf_name))
+              || (dpyinfo->font_table[i].full_name
+                  && !strcmp (dpyinfo->font_table[i].full_name, bdf_name)))
+            return dpyinfo->font_table + i;
+        }
+
       retval = w32_load_bdf_font (f, bdf_name, size, bdf_file);
 
       bdf_fonts = XCDR (bdf_fonts);
diff --git a/src/w32menu.c b/src/w32menu.c
index cc0932d7bf5..f3f3eb785b0 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -45,7 +45,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include "dispextern.h"
 
-#undef HAVE_MULTILINGUAL_MENU
 #undef HAVE_DIALOGS /* TODO: Implement native dialogs.  */
 
 /******************************************************************/
@@ -66,10 +65,12 @@ enum button_type
 typedef struct _widget_value
 {
   /* name of widget */
+  Lisp_Object   lname;
   char*         name;
   /* value (meaning depend on widget type) */
   char*         value;
   /* keyboard equivalent. no implications for XtTranslations */
+  Lisp_Object   lkey;
   char*         key;
   /* Help string or nil if none.
      GC finds this string through the frame's menu_bar_vector
@@ -136,17 +137,21 @@ typedef BOOL (WINAPI * GetMenuItemInfoA_Proc) (
     IN HMENU,
     IN UINT,
     IN BOOL,
-    IN OUT LPMENUITEMINFOA
-    );
+    IN OUT LPMENUITEMINFOA);
 typedef BOOL (WINAPI * SetMenuItemInfoA_Proc) (
     IN HMENU,
     IN UINT,
     IN BOOL,
-    IN LPCMENUITEMINFOA
-    );
+    IN LPCMENUITEMINFOA);
+typedef BOOL (WINAPI * AppendMenuW_Proc) (
+    IN HMENU,
+    IN UINT,
+    IN UINT_PTR,
+    IN LPCWSTR);
 
-GetMenuItemInfoA_Proc get_menu_item_info=NULL;
-SetMenuItemInfoA_Proc set_menu_item_info=NULL;
+GetMenuItemInfoA_Proc get_menu_item_info = NULL;
+SetMenuItemInfoA_Proc set_menu_item_info = NULL;
+AppendMenuW_Proc unicode_append_menu = NULL;
 
 Lisp_Object Vmenu_updating_frame;
 
@@ -1235,13 +1240,17 @@ digest_single_submenu (start, end, top_level_items)
           pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);
           prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
 
-#ifndef HAVE_MULTILINGUAL_MENU
-          if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
+          if (STRINGP (pane_name))
             {
-              pane_name = ENCODE_SYSTEM (pane_name);
+              if (unicode_append_menu)
+                /* Encode as UTF-8 for now.  */
+                pane_name = ENCODE_UTF_8 (pane_name);
+              else if (STRING_MULTIBYTE (pane_name))
+                pane_name = ENCODE_SYSTEM (pane_name);
+
               ASET (menu_items, i + MENU_ITEMS_PANE_NAME, pane_name);
             }
-#endif
+
           pane_string = (NILP (pane_name)
                          ? "" : (char *) SDATA (pane_name));
           /* If there is just one top-level pane, put all its items directly
@@ -1259,12 +1268,9 @@ digest_single_submenu (start, end, top_level_items)
                 save_wv->next = wv;
               else
                 first_wv->contents = wv;
-              wv->name = pane_string;
-              /* Ignore the @ that means "separate pane".
-                 This is a kludge, but this isn't worth more time.  */
-              if (!NILP (prefix) && wv->name[0] == '@')
-                wv->name++;
-              wv->value = 0;
+              wv->lname = pane_name;
+              /* Set value to 1 so update_submenu_strings can handle '@'  */
+              wv->value = (char *) 1;
               wv->enabled = 1;
               wv->button_type = BUTTON_TYPE_NONE;
               wv->help = Qnil;
@@ -1287,10 +1293,13 @@ digest_single_submenu (start, end, top_level_items)
           selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED);
           help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP);
 
-#ifndef HAVE_MULTILINGUAL_MENU
-          if (STRING_MULTIBYTE (item_name))
+          if (STRINGP (item_name))
             {
-              item_name = ENCODE_SYSTEM (item_name);
+              if (unicode_append_menu)
+                item_name = ENCODE_UTF_8 (item_name);
+              else if (STRING_MULTIBYTE (item_name))
+                item_name = ENCODE_SYSTEM (item_name);
+
               ASET (menu_items, i + MENU_ITEMS_ITEM_NAME, item_name);
             }
 
@@ -1299,7 +1308,6 @@ digest_single_submenu (start, end, top_level_items)
               descrip = ENCODE_SYSTEM (descrip);
               ASET (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY, descrip);
             }
-#endif /* not HAVE_MULTILINGUAL_MENU */
 
           wv = xmalloc_widget_value ();
           if (prev_wv)
@@ -1307,9 +1315,9 @@ digest_single_submenu (start, end, top_level_items)
           else
             save_wv->contents = wv;
 
-          wv->name = (char *) SDATA (item_name);
+          wv->lname = item_name;
           if (!NILP (descrip))
-            wv->key = (char *) SDATA (descrip);
+            wv->lkey = descrip;
           wv->value = 0;
           /* The EMACS_INT cast avoids a warning.  There's no problem
              as long as pointers have enough bits to hold small integers.  */
@@ -1348,6 +1356,43 @@ digest_single_submenu (start, end, top_level_items)
 
   return first_wv;
 }
+
+
+/* Walk through the widget_value tree starting at FIRST_WV and update
+   the char * pointers from the corresponding lisp values.
+   We do this after building the whole tree, since GC may happen while the
+   tree is constructed, and small strings are relocated.  So we must wait
+   until no GC can happen before storing pointers into lisp values.  */
+static void
+update_submenu_strings (first_wv)
+     widget_value *first_wv;
+{
+  widget_value *wv;
+
+  for (wv = first_wv; wv; wv = wv->next)
+    {
+      if (wv->lname && ! NILP (wv->lname))
+        {
+          wv->name = SDATA (wv->lname);
+
+          /* Ignore the @ that means "separate pane".
+             This is a kludge, but this isn't worth more time.  */
+          if (wv->value == (char *)1)
+            {
+              if (wv->name[0] == '@')
+                wv->name++;
+              wv->value = 0;
+            }
+        }
+
+      if (wv->lkey && ! NILP (wv->lkey))
+        wv->key = SDATA (wv->lkey);
+
+      if (wv->contents)
+        update_submenu_strings (wv->contents);
+    }
+}
+
 
 /* Set the contents of the menubar widgets of frame F.
    The argument FIRST_TIME is currently ignored;
@@ -1516,6 +1561,7 @@ set_frame_menubar (f, first_time, deep_p)
           if (NILP (string))
             break;
           wv->name = (char *) SDATA (string);
+          update_submenu_strings (wv->contents);
           wv = wv->next;
         }
 
@@ -1729,13 +1775,17 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error)
           char *pane_string;
           pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);
           prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
-#ifndef HAVE_MULTILINGUAL_MENU
-          if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
+
+          if (STRINGP (pane_name))
             {
-              pane_name = ENCODE_SYSTEM (pane_name);
+              if (unicode_append_menu)
+                pane_name = ENCODE_UTF_8 (pane_name);
+              else if (STRING_MULTIBYTE (pane_name))
+                pane_name = ENCODE_SYSTEM (pane_name);
+
               ASET (menu_items, i + MENU_ITEMS_PANE_NAME, pane_name);
             }
-#endif
+
           pane_string = (NILP (pane_name)
                          ? "" : (char *) SDATA (pane_name));
           /* If there is just one top-level pane, put all its items directly
@@ -1784,18 +1834,21 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error)
           selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED);
           help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP);
 
-#ifndef HAVE_MULTILINGUAL_MENU
-          if (STRINGP (item_name) && STRING_MULTIBYTE (item_name))
+          if (STRINGP (item_name))
             {
-              item_name = ENCODE_SYSTEM (item_name);
+              if (unicode_append_menu)
+                item_name = ENCODE_UTF_8 (item_name);
+              else if (STRING_MULTIBYTE (item_name))
+                item_name = ENCODE_SYSTEM (item_name);
+
               ASET (menu_items, i + MENU_ITEMS_ITEM_NAME, item_name);
             }
-          if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
+
+          if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
             {
               descrip = ENCODE_SYSTEM (descrip);
               ASET (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY, descrip);
             }
-#endif /* not HAVE_MULTILINGUAL_MENU */
 
           wv = xmalloc_widget_value ();
           if (prev_wv)
@@ -1844,10 +1897,11 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error)
       wv_sep->next = first_wv->contents;
       wv_sep->help = Qnil;
 
-#ifndef HAVE_MULTILINGUAL_MENU
-      if (STRING_MULTIBYTE (title))
+      if (unicode_append_menu)
+        title = ENCODE_UTF_8 (title);
+      else if (STRING_MULTIBYTE (title))
         title = ENCODE_SYSTEM (title);
-#endif
+
       wv_title->name = (char *) SDATA (title);
       wv_title->enabled = TRUE;
       wv_title->title = TRUE;
@@ -2150,6 +2204,46 @@ add_left_right_boundary (HMENU menu)
   return AppendMenu (menu, MF_MENUBARBREAK, 0, NULL);
 }
 
+/* UTF8: 0xxxxxxx, 110xxxxx 10xxxxxx, 1110xxxx, 10xxxxxx, 10xxxxxx */
+static void
+utf8to16 (unsigned char * src, int len, WCHAR * dest)
+{
+  while (len > 0)
+    {
+      int utf16;
+      if (*src < 0x80)
+        {
+          *dest = (WCHAR) *src;
+          dest++; src++; len--;
+        }
+      /* Since we might get >3 byte sequences which we don't handle, ignore the extra parts.  */
+      else if (*src < 0xC0)
+        {
+          src++; len--;
+        }
+      /* 2 char UTF-8 sequence.  */
+      else if (*src <  0xE0)
+        {
+          *dest = (WCHAR) (((*src & 0x1f) << 6)
+                           | (*(src + 1) & 0x3f));
+          src += 2; len -= 2; dest++;
+        }
+      else if (*src < 0xF0)
+        {
+          *dest = (WCHAR) (((*src & 0x0f) << 12)
+                           | ((*(src + 1) & 0x3f) << 6)
+                           | (*(src + 2) & 0x3f));
+          src += 3; len -= 3; dest++;
+        }
+      else /* Not encodable. Insert Unicode Substitution char.  */
+        {
+          *dest = (WCHAR) 0xfffd;
+          src++; len--; dest++;
+        }
+    }
+  *dest = 0;
+}
+
 static int
 add_menu_item (HMENU menu, widget_value *wv, HMENU item)
 {
@@ -2206,11 +2300,32 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
         fuFlags |= MF_UNCHECKED;
     }
 
-  return_value =
-    AppendMenu (menu,
-                fuFlags,
-                item != NULL ? (UINT) item : (UINT) wv->call_data,
-                out_string );
+  if (unicode_append_menu && out_string)
+    {
+      /* Convert out_string from UTF-8 to UTF-16-LE.  */
+      int utf8_len = strlen (out_string);
+      WCHAR * utf16_string;
+      if (fuFlags & MF_OWNERDRAW)
+        utf16_string = local_alloc ((utf8_len + 1) * sizeof (WCHAR));
+      else
+        utf16_string = alloca ((utf8_len + 1) * sizeof (WCHAR));
+
+      utf8to16 (out_string, utf8_len, utf16_string);
+      return_value = unicode_append_menu (menu, fuFlags,
+                                          item != NULL ? (UINT) item
+                                            : (UINT) wv->call_data,
+                                          utf16_string);
+      if (fuFlags & MF_OWNERDRAW)
+        local_free (out_string);
+    }
+  else
+    {
+      return_value =
+        AppendMenu (menu,
+                    fuFlags,
+                    item != NULL ? (UINT) item : (UINT) wv->call_data,
+                    out_string );
+    }
 
   /* This must be done after the menu item is created.  */
   if (!wv->title && wv->call_data != 0)
@@ -2298,7 +2413,7 @@ w32_menu_display_help (HWND owner, HMENU menu, UINT item, UINT flags)
       struct frame *f = x_window_to_frame (&one_w32_display_info, owner);
       Lisp_Object frame, help;
 
-      // No help echo on owner-draw menu items.
+      /* No help echo on owner-draw menu items.  */
       if (flags & MF_OWNERDRAW || flags & MF_POPUP)
         help = Qnil;
       else
@@ -2422,6 +2537,7 @@ void globals_of_w32menu ()
   HMODULE user32 = GetModuleHandle ("user32.dll");
   get_menu_item_info = (GetMenuItemInfoA_Proc) GetProcAddress (user32, "GetMenuItemInfoA");
   set_menu_item_info = (SetMenuItemInfoA_Proc) GetProcAddress (user32, "SetMenuItemInfoA");
+  unicode_append_menu = (AppendMenuW_Proc) GetProcAddress (user32, "AppendMenuW");
 }
 
 /* arch-tag: 0eaed431-bb4e-4aac-a527-95a1b4f1fed0
diff --git a/src/xdisp.c b/src/xdisp.c
index 35a4d755577..779109b83ab 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -307,6 +307,7 @@ Lisp_Object Qline_height, Qtotal;
 extern Lisp_Object Qheight;
 extern Lisp_Object QCwidth, QCheight, QCascent;
 extern Lisp_Object Qscroll_bar;
+extern Lisp_Object Qcursor;
 
 /* Non-nil means highlight trailing whitespace.  */
 
@@ -10747,6 +10748,7 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
 {
   struct glyph *glyph = row->glyphs[TEXT_AREA];
   struct glyph *end = glyph + row->used[TEXT_AREA];
+  struct glyph *cursor = NULL;
   /* The first glyph that starts a sequence of glyphs from string.  */
   struct glyph *string_start;
   /* The X coordinate of string_start.  */
@@ -10756,6 +10758,7 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
   /* The last known character position before string_start.  */
   int string_before_pos;
   int x = row->x;
+  int cursor_x = x;
   int pt_old = PT - delta;
 
   /* Skip over glyphs not having an object at the start of the row.
@@ -10788,12 +10791,29 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
           string_start = glyph;
           string_start_x = x;
           /* Skip all glyphs from string.  */
-          SKIP_GLYPHS (glyph, end, x, STRINGP (glyph->object));
+          do
+            {
+              if ((cursor == NULL || glyph > cursor)
+                  && !NILP (Fget_char_property (make_number ((glyph)->charpos),
+                                                Qcursor, (glyph)->object)))
+                {
+                  cursor = glyph;
+                  cursor_x = x;
+                }
+              x += glyph->pixel_width;
+              ++glyph;
+            }
+          while (glyph < end && STRINGP (glyph->object));
         }
     }
 
-  if (string_start
-      && (glyph == end || !BUFFERP (glyph->object) || last_pos > pt_old))
+  if (cursor != NULL)
+    {
+      glyph = cursor;
+      x = cursor_x;
+    }
+  else if (string_start
+           && (glyph == end || !BUFFERP (glyph->object) || last_pos > pt_old))
     {
       /* We may have skipped over point because the previous glyphs
          are from string.  As there's no easy way to know the
@@ -11185,8 +11205,8 @@ try_scrolling (window, just_this_one_p, scroll_conservatively,
           start_display (&it, w, startp);
 
           if (scroll_conservatively)
-            amount_to_scroll =
-              max (dy, FRAME_LINE_HEIGHT (f) * max (scroll_step, temp_scroll_step));
+            amount_to_scroll
+              = max (dy, FRAME_LINE_HEIGHT (f) * max (scroll_step, temp_scroll_step));
           else if (scroll_step || temp_scroll_step)
             amount_to_scroll = scroll_max;
           else
@@ -11465,8 +11485,7 @@ try_cursor_movement (window, startp, scroll_step)
           else if (PT < XFASTINT (w->last_point))
             {
               /* Cursor has to be moved backward.  Note that PT >=
-                 CHARPOS (startp) because of the outer
-                 if-statement.  */
+                 CHARPOS (startp) because of the outer if-statement.  */
               while (!row->mode_line_p
                      && (MATRIX_ROW_START_CHARPOS (row) > PT
                          || (MATRIX_ROW_START_CHARPOS (row) == PT
@@ -11978,8 +11997,8 @@ redisplay_window (window, just_this_one_p)
              buffer.  */
           || !NILP (Vwindow_scroll_functions)
           || MINI_WINDOW_P (w)
-          || !(used_current_matrix_p =
-               try_window_reusing_current_matrix (w)))
+          || !(used_current_matrix_p
+               = try_window_reusing_current_matrix (w)))
         {
           IF_DEBUG (debug_method_add (w, "1"));
           try_window (window, startp);
@@ -12108,8 +12127,8 @@ redisplay_window (window, just_this_one_p)
       || !NILP (Vwindow_scroll_functions)
       || !just_this_one_p
       || MINI_WINDOW_P (w)
-      || !(used_current_matrix_p =
-           try_window_reusing_current_matrix (w)))
+      || !(used_current_matrix_p
+           = try_window_reusing_current_matrix (w)))
     try_window (window, startp);
 
   /* If new fonts have been loaded (due to fontsets), give up.  We
@@ -15774,7 +15793,8 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
    The mode_line_string_face face property is always added to the string.
  */
 
-static int store_mode_line_string (string, lisp_string, copy_string, field_width, precision, props)
+static int
+store_mode_line_string (string, lisp_string, copy_string, field_width, precision, props)
      char *string;
      Lisp_Object lisp_string;
      int copy_string;
@@ -15886,32 +15906,32 @@ If third optional arg NO-PROPS is non-nil, string is not propertized.  */)
 
   if (NILP (format) || EQ (format, Qt))
     {
-      face_id = NILP (format)
-        ? CURRENT_MODE_LINE_FACE_ID (w) :
-        HEADER_LINE_FACE_ID;
-      format = NILP (format)
-        ? current_buffer->mode_line_format
-        : current_buffer->header_line_format;
+      face_id = (NILP (format)
+                 ? CURRENT_MODE_LINE_FACE_ID (w)
+                 : HEADER_LINE_FACE_ID);
+      format = (NILP (format)
+                ? current_buffer->mode_line_format
+                : current_buffer->header_line_format);
     }
 
   init_iterator (&it, w, -1, -1, NULL, face_id);
 
   if (NILP (no_props))
     {
-      mode_line_string_face =
-        (face_id == MODE_LINE_FACE_ID ? Qmode_line :
-         face_id == MODE_LINE_INACTIVE_FACE_ID ? Qmode_line_inactive :
-         face_id == HEADER_LINE_FACE_ID ? Qheader_line : Qnil);
+      mode_line_string_face
+        = (face_id == MODE_LINE_FACE_ID ? Qmode_line
+           : face_id == MODE_LINE_INACTIVE_FACE_ID ? Qmode_line_inactive
+           : face_id == HEADER_LINE_FACE_ID ? Qheader_line : Qnil);
 
-      mode_line_string_face_prop =
-        NILP (mode_line_string_face) ? Qnil :
-        Fcons (Qface, Fcons (mode_line_string_face, Qnil));
+      mode_line_string_face_prop
+        = (NILP (mode_line_string_face) ? Qnil
+           : Fcons (Qface, Fcons (mode_line_string_face, Qnil)));
 
       /* We need a dummy last element in mode_line_string_list to
          indicate we are building the propertized mode-line string.
          Using mode_line_string_face_prop here GC protects it.  */
-      mode_line_string_list =
-        Fcons (mode_line_string_face_prop, Qnil);
+      mode_line_string_list
+        = Fcons (mode_line_string_face_prop, Qnil);
       frame_title_ptr = NULL;
     }
   else
@@ -21038,7 +21058,8 @@ note_mouse_highlight (f, x, y)
 
   if (part == ON_VERTICAL_BORDER)
     cursor = FRAME_X_OUTPUT (f)->horizontal_drag_cursor;
-  else if (part == ON_LEFT_FRINGE || part == ON_RIGHT_FRINGE)
+  else if (part == ON_LEFT_FRINGE || part == ON_RIGHT_FRINGE
+           || part == ON_SCROLL_BAR)
     cursor = FRAME_X_OUTPUT (f)->nontext_cursor;
   else
     cursor = FRAME_X_OUTPUT (f)->text_cursor;
diff --git a/src/xfns.c b/src/xfns.c
index f392757b949..b0864cbdffe 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1540,61 +1540,15 @@ x_encode_text (string, coding_system, selectionp, text_bytes, stringp)
 }
 
 
-/* Change the name of frame F to NAME.  If NAME is nil, set F's name to
-       x_id_name.
-
-   If EXPLICIT is non-zero, that indicates that lisp code is setting the
-       name; if NAME is a string, set F's name to NAME and set
-       F->explicit_name; if NAME is Qnil, then clear F->explicit_name.
+/* Set the WM name to NAME for frame F. Also set the icon name.
+   If the frame already has an icon name, use that, otherwise set the
+   icon name to NAME.  */
 
-   If EXPLICIT is zero, that indicates that Emacs redisplay code is
-       suggesting a new name, which lisp code should override; if
-       F->explicit_name is set, ignore the new name; otherwise, set it.  */
-
-void
-x_set_name (f, name, explicit)
-     struct frame *f;
+static void
+x_set_name_internal (f, name)
+     FRAME_PTR f;
      Lisp_Object name;
-     int explicit;
 {
-  /* Make sure that requests from lisp code override requests from
-     Emacs redisplay code.  */
-  if (explicit)
-    {
-      /* If we're switching from explicit to implicit, we had better
-         update the mode lines and thereby update the title.  */
-      if (f->explicit_name && NILP (name))
-        update_mode_lines = 1;
-
-      f->explicit_name = ! NILP (name);
-    }
-  else if (f->explicit_name)
-    return;
-
-  /* If NAME is nil, set the name to the x_id_name.  */
-  if (NILP (name))
-    {
-      /* Check for no change needed in this very common case
-         before we do any consing.  */
-      if (!strcmp (FRAME_X_DISPLAY_INFO (f)->x_id_name,
-                   SDATA (f->name)))
-        return;
-      name = build_string (FRAME_X_DISPLAY_INFO (f)->x_id_name);
-    }
-  else
-    CHECK_STRING (name);
-
-  /* Don't change the name if it's already NAME.  */
-  if (! NILP (Fstring_equal (name, f->name)))
-    return;
-
-  f->name = name;
-
-  /* For setting the frame title, the title parameter should override
-     the name parameter.  */
-  if (! NILP (f->title))
-    name = f->title;
-
   if (FRAME_X_WINDOW (f))
     {
       BLOCK_INPUT;
@@ -1602,8 +1556,10 @@ x_set_name (f, name, explicit)
       {
         XTextProperty text, icon;
         int bytes, stringp;
+        int do_free_icon_value = 0, do_free_text_value = 0;
         Lisp_Object coding_system;
 
+        coding_system = Qcompound_text;
         /* Note: Encoding strategy
 
            We encode NAME by compound-text and use "COMPOUND-TEXT" in
@@ -1618,13 +1574,16 @@ x_set_name (f, name, explicit)
            in the future which can encode all Unicode characters.
            But, for the moment, there's no way to know that the
            current window manager supports it or not.  */
-        coding_system = Qcompound_text;
         text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp);
         text.encoding = (stringp ? XA_STRING
                          : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
         text.format = 8;
         text.nitems = bytes;
 
+        /* Check early, because ENCODE_UTF_8 below may GC and name may be
+           relocated.  */
+        do_free_text_value = text.value != SDATA (name);
+
         if (NILP (f->icon_name))
           {
             icon = text;
@@ -1638,7 +1597,9 @@ x_set_name (f, name, explicit)
                              : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
             icon.format = 8;
             icon.nitems = bytes;
+            do_free_icon_value = icon.value != SDATA (f->icon_name);
           }
+
 #ifdef USE_GTK
         gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
                               SDATA (ENCODE_UTF_8 (name)));
@@ -1648,10 +1609,9 @@ x_set_name (f, name, explicit)
 
         XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &icon);
 
-        if (!NILP (f->icon_name)
-            && icon.value != (unsigned char *) SDATA (f->icon_name))
+        if (do_free_icon_value)
           xfree (icon.value);
-        if (text.value != (unsigned char *) SDATA (name))
+        if (do_free_text_value)
           xfree (text.value);
       }
 #else /* not HAVE_X11R4 */
@@ -1664,6 +1624,64 @@ x_set_name (f, name, explicit)
     }
 }
 
+/* Change the name of frame F to NAME.  If NAME is nil, set F's name to
+       x_id_name.
+
+   If EXPLICIT is non-zero, that indicates that lisp code is setting the
+       name; if NAME is a string, set F's name to NAME and set
+       F->explicit_name; if NAME is Qnil, then clear F->explicit_name.
+
+   If EXPLICIT is zero, that indicates that Emacs redisplay code is
+       suggesting a new name, which lisp code should override; if
+       F->explicit_name is set, ignore the new name; otherwise, set it.  */
+
+void
+x_set_name (f, name, explicit)
+     struct frame *f;
+     Lisp_Object name;
+     int explicit;
+{
+  /* Make sure that requests from lisp code override requests from
+     Emacs redisplay code.  */
+  if (explicit)
+    {
+      /* If we're switching from explicit to implicit, we had better
+         update the mode lines and thereby update the title.  */
+      if (f->explicit_name && NILP (name))
+        update_mode_lines = 1;
+
+      f->explicit_name = ! NILP (name);
+    }
+  else if (f->explicit_name)
+    return;
+
+  /* If NAME is nil, set the name to the x_id_name.  */
+  if (NILP (name))
+    {
+      /* Check for no change needed in this very common case
+         before we do any consing.  */
+      if (!strcmp (FRAME_X_DISPLAY_INFO (f)->x_id_name,
+                   SDATA (f->name)))
+        return;
+      name = build_string (FRAME_X_DISPLAY_INFO (f)->x_id_name);
+    }
+  else
+    CHECK_STRING (name);
+
+  /* Don't change the name if it's already NAME.  */
+  if (! NILP (Fstring_equal (name, f->name)))
+    return;
+
+  f->name = name;
+
+  /* For setting the frame title, the title parameter should override
+     the name parameter.  */
+  if (! NILP (f->title))
+    name = f->title;
+
+  x_set_name_internal (f, name);
+}
+
 /* This function should be called when the user's lisp code has
    specified a name for the frame; the name will override any set by the
    redisplay code.  */
@@ -1715,62 +1733,7 @@ x_set_title (f, name, old_name)
   else
     CHECK_STRING (name);
 
-  if (FRAME_X_WINDOW (f))
-    {
-      BLOCK_INPUT;
-#ifdef HAVE_X11R4
-      {
-        XTextProperty text, icon;
-        int bytes, stringp;
-        Lisp_Object coding_system;
-
-        coding_system = Qcompound_text;
-        /* See the comment "Note: Encoding strategy" in x_set_name.  */
-        text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp);
-        text.encoding = (stringp ? XA_STRING
-                         : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
-        text.format = 8;
-        text.nitems = bytes;
-
-        if (NILP (f->icon_name))
-          {
-            icon = text;
-          }
-        else
-          {
-            /* See the comment "Note: Encoding strategy" in x_set_name.  */
-            icon.value = x_encode_text (f->icon_name, coding_system, 0,
-                                        &bytes, &stringp);
-            icon.encoding = (stringp ? XA_STRING
-                             : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
-            icon.format = 8;
-            icon.nitems = bytes;
-          }
-
-#ifdef USE_GTK
-        gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                              SDATA (ENCODE_UTF_8 (name)));
-#else /* not USE_GTK */
-        XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
-#endif /* not USE_GTK */
-
-        XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
-                        &icon);
-
-        if (!NILP (f->icon_name)
-            && icon.value != (unsigned char *) SDATA (f->icon_name))
-          xfree (icon.value);
-        if (text.value != (unsigned char *) SDATA (name))
-          xfree (text.value);
-      }
-#else /* not HAVE_X11R4 */
-      XSetIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                    SDATA (name));
-      XStoreName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                  SDATA (name));
-#endif /* not HAVE_X11R4 */
-      UNBLOCK_INPUT;
-    }
+  x_set_name_internal (f, name);
 }
 
 void
diff --git a/src/xmenu.c b/src/xmenu.c
index 08bad9c2241..eddda3ef91b 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1701,12 +1701,9 @@ digest_single_submenu (start, end, top_level_items)
                 save_wv->next = wv;
               else
                 first_wv->contents = wv;
-              wv->name = pane_string;
-              /* Ignore the @ that means "separate pane".
-                 This is a kludge, but this isn't worth more time.  */
-              if (!NILP (prefix) && wv->name[0] == '@')
-                wv->name++;
-              wv->value = 0;
+              wv->lname = pane_name;
+              /* Set value to 1 so update_submenu_strings can handle '@'  */
+              wv->value = (char *)1;
               wv->enabled = 1;
               wv->button_type = BUTTON_TYPE_NONE;
               wv->help = Qnil;
@@ -1749,9 +1746,9 @@ digest_single_submenu (start, end, top_level_items)
           else
             save_wv->contents = wv;
 
-          wv->name = (char *) SDATA (item_name);
+          wv->lname = item_name;
           if (!NILP (descrip))
-            wv->key = (char *) SDATA (descrip);
+            wv->lkey = descrip;
           wv->value = 0;
           /* The EMACS_INT cast avoids a warning.  There's no problem
              as long as pointers have enough bits to hold small integers.  */
@@ -1790,6 +1787,42 @@ digest_single_submenu (start, end, top_level_items)
 
   return first_wv;
 }
+
+/* Walk through the widget_value tree starting at FIRST_WV and update
+   the char * pointers from the corresponding lisp values.
+   We do this after building the whole tree, since GC may happen while the
+   tree is constructed, and small strings are relocated.  So we must wait
+   until no GC can happen before storing pointers into lisp values.  */
+static void
+update_submenu_strings (first_wv)
+     widget_value *first_wv;
+{
+  widget_value *wv;
+
+  for (wv = first_wv; wv; wv = wv->next)
+    {
+      if (wv->lname && ! NILP (wv->lname))
+        {
+          wv->name = SDATA (wv->lname);
+
+          /* Ignore the @ that means "separate pane".
+             This is a kludge, but this isn't worth more time.  */
+          if (wv->value == (char *)1)
+            {
+              if (wv->name[0] == '@')
+                wv->name++;
+              wv->value = 0;
+            }
+        }
+
+      if (wv->lkey && ! NILP (wv->lkey))
+        wv->key = SDATA (wv->lkey);
+
+      if (wv->contents)
+        update_submenu_strings (wv->contents);
+    }
+}
+
 
 /* Recompute all the widgets of frame F, when the menu bar has been
    changed.  Value is non-zero if widgets were updated.  */
@@ -2022,9 +2055,10 @@ set_frame_menubar (f, first_time, deep_p)
           Lisp_Object string;
           string = XVECTOR (items)->contents[i + 1];
           if (NILP (string))
-            break;
-          wv->name = (char *) SDATA (string);
-          wv = wv->next;
+            break;
+          wv->name = (char *) SDATA (string);
+          update_submenu_strings (wv->contents);
+          wv = wv->next;
         }
 
       f->menu_bar_vector = menu_items;