Merge from emacs-24; up to 2012-12-20T05:05:41Z!dmantipov@yandex.ru

2 files changed, 11 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4be1e28dbcd..e945e221593 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (x_draw_vertical_border): For a window that is neither
+        the leftmost nor the rightmost, redraw both the left and the right
+        vertical borders.  (Bug#13723)
+
 2013-02-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xml.c (init_libxml2_functions):
diff --git a/src/xdisp.c b/src/xdisp.c
index c41b7f3c8cb..08958f44575 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28244,6 +28244,9 @@ x_draw_vertical_border (struct window *w)
   if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
     return;
 
+  /* Note: It is necessary to redraw bot the left and the right
+     borders, for when only this single window W is being
+     redisplayed.  */
   if (!WINDOW_RIGHTMOST_P (w)
       && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
     {
@@ -28257,8 +28260,8 @@ x_draw_vertical_border (struct window *w)
 
       FRAME_RIF (f)->draw_vertical_window_border (w, x1, y0, y1);
     }
-  else if (!WINDOW_LEFTMOST_P (w)
-           && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
+  if (!WINDOW_LEFTMOST_P (w)
+      && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
     {
       int x0, x1, y0, y1;