aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2003-03-26 16:13:44 +0000
committerJan Djärv2003-03-26 16:13:44 +0000
commit70b6104c5d1bf74f72edc9a2b3a6579c3aab9109 (patch)
treeccedab513a1863c318cd5e0c3fb0e4df71fa7a65 /src
parentd9b36d19190320c497d9e3776f28b2ae4d132dae (diff)
downloademacs-70b6104c5d1bf74f72edc9a2b3a6579c3aab9109.tar.gz
emacs-70b6104c5d1bf74f72edc9a2b3a6579c3aab9109.zip
* xdisp.c (update_menu_bar): Set w->update_mode_line to Qt
so tool bar gets updated.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2ce23055896..d04286bc795 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12003-03-26 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xdisp.c (update_menu_bar): Set w->update_mode_line to Qt
4 so tool bar gets updated.
5
12003-03-26 Stefan Monnier <monnier@cs.yale.edu> 62003-03-26 Stefan Monnier <monnier@cs.yale.edu>
2 7
3 * data.c (store_symval_forwarding): Re-instate part of the code 8 * data.c (store_symval_forwarding): Re-instate part of the code
diff --git a/src/xdisp.c b/src/xdisp.c
index 718ef1702d0..32c84757072 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7905,11 +7905,16 @@ update_menu_bar (f, save_match_data)
7905 window = FRAME_SELECTED_WINDOW (f); 7905 window = FRAME_SELECTED_WINDOW (f);
7906 w = XWINDOW (window); 7906 w = XWINDOW (window);
7907 7907
7908#if 0 /* The if statement below this if statement used to include the 7908#if 1 /* The if statement below this if statement used to include the
7909 condition !NILP (w->update_mode_line), rather than using 7909 condition !NILP (w->update_mode_line), rather than using
7910 update_mode_lines directly, and this if statement may have 7910 update_mode_lines directly, and this if statement may have
7911 been added to make that condition work. Now the if 7911 been added to make that condition work. Now the if
7912 statement below matches its comment, this isn't needed. */ 7912 statement below matches its comment, this isn't needed. */
7913 /* We need to set w->update_mode_line to Qt so that update_tool_bar
7914 rebuilds tool bar items. For example, to notice when a tool bar item
7915 goes from enabled to disabled state.
7916 A better way would be to notice tool bar, menu bar and mode line
7917 changes separately, but for now update_mode_line is all we got. */
7913 if (update_mode_lines) 7918 if (update_mode_lines)
7914 w->update_mode_line = Qt; 7919 w->update_mode_line = Qt;
7915#endif 7920#endif