diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-06-15 18:18:55 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-06-15 18:18:55 +0000 |
| commit | aba55e8dde6fcc104afe3c69ea48ac76b55e885f (patch) | |
| tree | 0b123e087cbaf24ea73d4ba9293e5555327dd3ef | |
| parent | 42bb2790f0d45bd45f8b2973d6ba7d68a21a75e5 (diff) | |
| download | emacs-aba55e8dde6fcc104afe3c69ea48ac76b55e885f.tar.gz emacs-aba55e8dde6fcc104afe3c69ea48ac76b55e885f.tar.bz2 emacs-aba55e8dde6fcc104afe3c69ea48ac76b55e885f.zip | |
(redisplay): Don't call x_consider_frame_title.
(display_mode_line): Likewise.
(prepare_menu_bars): Call it here.
| -rw-r--r-- | src/xdisp.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index fa6e0c1493c..da05044a963 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -455,6 +455,17 @@ prepare_menu_bars () all_windows = (update_mode_lines || buffer_shared > 1 || clip_changed || windows_or_buffers_changed); +#ifdef HAVE_X_WINDOWS + { + 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. */ @@ -701,11 +712,6 @@ redisplay () if (FRAME_VISIBLE_P (f)) redisplay_windows (FRAME_ROOT_WINDOW (f)); -#ifdef HAVE_X_WINDOWS - else if (FRAME_ICONIFIED_P (f) - && ! MINI_WINDOW_P (XWINDOW (f->selected_window))) - x_consider_frame_title (frame); -#endif /* Any scroll bars which redisplay_windows should have nuked should now go away. */ @@ -2577,11 +2583,6 @@ display_mode_line (w) ptr[i] = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (ptr[i]), 1); } #endif - -#ifdef HAVE_X_WINDOWS - if (w == XWINDOW (f->selected_window)) - x_consider_frame_title (WINDOW_FRAME (w)); -#endif } /* Contribute ELT to the mode line for window W. |