changeset 44156:b135f9d8d993

(update_menu_bar): Test only update_mode_lines; don't test or alter w->update_mode_line.
author Richard M. Stallman <rms@gnu.org>
date Tue, 26 Mar 2002 09:11:43 +0000
parents d94cb7b3b165
children 1965fb963598
files src/xdisp.c
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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))