# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1017133903 0
# Node ID b135f9d8d9937b7652497b248b73d67a0eb8cc82
# Parent  d94cb7b3b165c4479960b5b2a98ce19aebd29f69
(update_menu_bar): Test only update_mode_lines;
don't test or alter w->update_mode_line.

diff -r d94cb7b3b165 -r b135f9d8d993 src/xdisp.c
--- a/src/xdisp.c	Tue Mar 26 09:09:56 2002 +0000
+++ b/src/xdisp.c	Tue Mar 26 09:11:43 2002 +0000
@@ -7435,8 +7435,14 @@
   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 @@
 	 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))