From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Wed, 14 Nov 2012 11:13:33 +0000 (+0400)
Subject: * xdisp.c (echo_area_display, redisplay_internal):
X-Git-Tag: emacs-24.3.90~173^2~18^2~110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77731919f923a5fc81db60d19952776417a00037;p=emacs.git

* xdisp.c (echo_area_display, redisplay_internal):
Omit redundant check whether frame_garbaged is set.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a6b42e8a58c..99f3128b321 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-14  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* xdisp.c (echo_area_display, redisplay_internal):
+	Omit redundant check whether frame_garbaged is set.
+
 2012-11-14  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use faccessat, not access, when checking file permissions (Bug#12632).
diff --git a/src/xdisp.c b/src/xdisp.c
index a74628db392..27d9fff0b7d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10816,8 +10816,7 @@ echo_area_display (int update_frame_p)
 #endif /* HAVE_WINDOW_SYSTEM */
 
   /* Redraw garbaged frames.  */
-  if (frame_garbaged)
-    clear_garbaged_frames ();
+  clear_garbaged_frames ();
 
   if (!NILP (echo_area_buffer[0]) || minibuf_level == 0)
     {
@@ -13104,8 +13103,7 @@ redisplay_internal (void)
     }
 
   /* Clear frames marked as garbaged.  */
-  if (frame_garbaged)
-    clear_garbaged_frames ();
+  clear_garbaged_frames ();
 
   /* Build menubar and tool-bar items.  */
   if (NILP (Vmemory_full))
@@ -13189,8 +13187,7 @@ redisplay_internal (void)
 	  /* If window configuration was changed, frames may have been
 	     marked garbaged.  Clear them or we will experience
 	     surprises wrt scrolling.  */
-	  if (frame_garbaged)
-	    clear_garbaged_frames ();
+	  clear_garbaged_frames ();
 	}
     }
   else if (EQ (selected_window, minibuf_window)
@@ -13213,8 +13210,7 @@ redisplay_internal (void)
       /* If window configuration was changed, frames may have been
 	 marked garbaged.  Clear them or we will experience
 	 surprises wrt scrolling.  */
-      if (frame_garbaged)
-	clear_garbaged_frames ();
+      clear_garbaged_frames ();
     }