From: Kim F. Storm <storm@cua.dk>
Date: Mon, 5 Apr 2004 21:41:08 +0000 (+0000)
Subject: (vmotion): Do not reserve one column for continuation
X-Git-Tag: ttn-vms-21-2-B4~6956
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7b8339b6033bc7e77a94cf9cb4db5d3f99eb915b;p=emacs.git

(vmotion): Do not reserve one column for continuation
marks on window frames.
---

diff --git a/src/indent.c b/src/indent.c
index 9a2ab0956e5..2651d4d7c06 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1836,9 +1836,7 @@ vmotion (from, vtarget, w)
      register int from, vtarget;
      struct window *w;
 {
-  /* We don't need to make room for continuation marks (we have fringes now),
-     so hould we really subtract 1 here if FRAME_WINDOW_P ?  ++KFS  */
-  int width = window_box_text_cols (w) - 1;
+  int width = window_box_text_cols (w);
   int hscroll = XINT (w->hscroll);
   struct position pos;
   /* vpos is cumulative vertical position, changed as from is changed */
@@ -1859,6 +1857,12 @@ vmotion (from, vtarget, w)
 
   XSETWINDOW (window, w);
 
+  /* We must make room for continuation marks if we don't have fringes.  */
+#ifdef HAVE_WINDOW_SYSTEM
+  if (!FRAME_WINDOW_P (XFRAME (w->frame)))
+#endif
+    width -= 1;
+
   /* If the window contains this buffer, use it for getting text properties.
      Otherwise use the current buffer as arg for doing that.  */
   if (EQ (w->buffer, Fcurrent_buffer ()))