From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 10 Oct 1994 21:30:56 +0000 (+0000)
Subject: (redisplay_window): Fix Oct 1 change:
X-Git-Tag: emacs-19.34~6434
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f27fa9b16c95b1f6c32c812aead9db4eca0e1e2;p=emacs.git

(redisplay_window): Fix Oct 1 change:
don't call cancel_my_columns unless we will call try_window.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 7b464dfa74e..9b476a7f29b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1186,10 +1186,12 @@ redisplay_window (window, just_this_one)
 	    }
 	  /* If we are highlighting the region,
 	     then we just changed the region, so redisplay to show it.  */
-	  cancel_my_columns (XWINDOW (window));
 	  if (!NILP (Vtransient_mark_mode)
 	      && !NILP (current_buffer->mark_active))
-	    try_window (window, startp);
+	    {
+	      cancel_my_columns (XWINDOW (window));
+	      try_window (window, startp);
+	    }
 	}
       goto done;
     }