(prepare_menu_bars): Do the frame titles last.

1 files changed, 16 insertions, 12 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 02c71203b1d..833f9083511 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -680,18 +680,6 @@ prepare_menu_bars ()
   all_windows = (update_mode_lines || buffer_shared > 1
                  || clip_changed || windows_or_buffers_changed);
 
-#ifdef HAVE_X_WINDOWS
-  if (windows_or_buffers_changed)
-    {
-      Lisp_Object tail, frame;
-
-      FOR_EACH_FRAME (tail, frame)
-        if (FRAME_VISIBLE_P (XFRAME (frame))
-            || FRAME_ICONIFIED_P (XFRAME (frame)))
-          x_consider_frame_title (frame);
-    }
-#endif
-
   /* Update the menu bar item lists, if appropriate.
      This has to be done before any actual redisplay
      or generation of display lines.  */
@@ -723,6 +711,22 @@ prepare_menu_bars ()
     }
   else
     update_menu_bar (selected_frame);
+
+  /* Update all frame titles based on their buffer names, etc.
+     We do this after the menu bars so that the frame will first
+     create its menu bar using the name `emacs' if no other name
+     has yet been specified.  */
+#ifdef HAVE_X_WINDOWS
+  if (windows_or_buffers_changed)
+    {
+      Lisp_Object tail, frame;
+
+      FOR_EACH_FRAME (tail, frame)
+        if (FRAME_VISIBLE_P (XFRAME (frame))
+            || FRAME_ICONIFIED_P (XFRAME (frame)))
+          x_consider_frame_title (frame);
+    }
+#endif
 }
 
 /* Do a frame update, taking possible shortcuts into account.