/* Indentation functions.
- Copyright (C) 1985,86,87,88,93,94,95,98,2000,01,02,2003
+ Copyright (C) 1985,86,87,88,93,94,95,98,2000,01,02,03,2004
Free Software Foundation, Inc.
This file is part of GNU Emacs.
vpos++;
contin_hpos = prev_hpos;
prev_hpos = 0;
+ prev_vpos = vpos;
}
}
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 */
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 ()))