(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 7b464dfa74eb8cc43ddc0120d19f83cc140e5384..9b476a7f29bba846706e51642571ccd9e2e575d0 100644 (file)
--- 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;
     }