(redisplay_window): Fix Oct 1 change:

don't call cancel_my_columns unless we will call try_window.

1 files changed, 4 insertions, 2 deletions

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;
     }