Mercurial > emacs
changeset 11284:0340dba1df7e
(prepare_menu_bars): Do the frame titles last.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 08 Apr 1995 00:19:28 +0000 |
| parents | 4bfe7ca7e1f9 |
| children | 7b90c1076881 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 16 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Sat Apr 08 00:01:20 1995 +0000 +++ b/src/xdisp.c Sat Apr 08 00:19:28 1995 +0000 @@ -680,18 +680,6 @@ 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 @@ } 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.