[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE]
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE] |
Date: |
Mon, 28 Jul 2008 19:52:38 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Chong Yidong <cyd> 08/07/28 19:52:37
Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1149.2.28
retrieving revision 1.1149.2.29
diff -u -b -r1.1149.2.28 -r1.1149.2.29
--- xdisp.c 28 Jul 2008 19:41:11 -0000 1.1149.2.28
+++ xdisp.c 28 Jul 2008 19:52:35 -0000 1.1149.2.29
@@ -13239,16 +13239,11 @@
&& NILP (do_mouse_tracking)
&& CHARPOS (startp) > BEGV
&& CHARPOS (startp) > BEG + save_beg_unchanged
- && CHARPOS (startp) <= Z - save_end_unchanged
- /* Even if w->start_at_line_beg is nil, a new window may
- start at a line_beg, since that's how set_buffer_window
- sets it. So, we need to check the return value of
- compute_window_start_on_continuation_line. (See also
- bug#197). */
- && XMARKER (w->start)->buffer == current_buffer
- && compute_window_start_on_continuation_line (w))
+ && CHARPOS (startp) <= Z - save_end_unchanged)
{
w->force_start = Qt;
+ if (XMARKER (w->start)->buffer == current_buffer)
+ compute_window_start_on_continuation_line (w);
SET_TEXT_POS_FROM_MARKER (startp, w->start);
goto force_start;
}