(update_menu_bar): Test only update_mode_lines;

don't test or alter w->update_mode_line.

2 files changed, 20 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 30270115fa0..4f475d21960 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2002-03-26  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (update_menu_bar): Test only update_mode_lines;
+        don't test or alter w->update_mode_line.
+
+        * window.c (Fdisplay_buffer): Doc fix.
+
+2002-03-24  Richard M. Stallman  <rms@gnu.org>
+
+        * regex.c (GET_UNSIGNED_NUMBER): Give proper error for spaces.
+
 2002-03-24  Gerd Moellmann  <gerd@gnu.org>
 
         * eval.c (Qdeclare, Vmacro_declaration_function): New variables.
diff --git a/src/xdisp.c b/src/xdisp.c
index cc9c177c29c..8a760caa5e3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7435,8 +7435,14 @@ update_menu_bar (f, save_match_data)
   window = FRAME_SELECTED_WINDOW (f);
   w = XWINDOW (window);
   
+#if 0 /* The if statment below this if statement used to include the
+         condition !NILP (w->update_mode_line), rather than using
+         update_mode_lines directly, and this if statement may have
+         been added to make that condition work.  Now the if
+         statement below matches its comment, this isn't needed.  */  
   if (update_mode_lines)
     w->update_mode_line = Qt;
+#endif
 
   if (FRAME_WINDOW_P (f)
       ?
@@ -7455,7 +7461,9 @@ update_menu_bar (f, save_match_data)
          the rest of the redisplay algorithm is about the same as
          windows_or_buffers_changed anyway.  */
       if (windows_or_buffers_changed
-          || !NILP (w->update_mode_line)
+          /* This used to test w->update_mode_line, but we believe
+             there is no need to recompute the menu in that case.  */
+          || update_mode_lines
           || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer))
                < BUF_MODIFF (XBUFFER (w->buffer)))
               != !NILP (w->last_had_star))