[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/indent.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/indent.c |
Date: |
Wed, 13 Jul 2005 06:02:58 -0400 |
Index: emacs/src/indent.c
diff -c emacs/src/indent.c:1.178 emacs/src/indent.c:1.179
*** emacs/src/indent.c:1.178 Mon Jul 4 16:06:31 2005
--- emacs/src/indent.c Wed Jul 13 10:02:58 2005
***************
*** 2074,2079 ****
--- 2074,2080 ----
{
int it_start;
int oselective;
+ int start_on_image_p;
SET_TEXT_POS (pt, PT, PT_BYTE);
start_display (&it, w, pt);
***************
*** 2085,2090 ****
--- 2086,2092 ----
while the end position is really at some X > 0, the same X that
PT had. */
it_start = IT_CHARPOS (it);
+ start_on_image_p = (it.method == GET_FROM_IMAGE);
reseat_at_previous_visible_line_start (&it);
it.current_x = it.hpos = 0;
/* Temporarily disable selective display so we don't move too far */
***************
*** 2094,2101 ****
it.selective = oselective;
/* Move back if we got too far. This may happen if
! truncate-lines is on and PT is beyond right margin. */
! if (IT_CHARPOS (it) > it_start && XINT (lines) > 0)
move_it_by_lines (&it, -1, 0);
it.vpos = 0;
--- 2096,2105 ----
it.selective = oselective;
/* Move back if we got too far. This may happen if
! truncate-lines is on and PT is beyond right margin.
! It may also happen if it_start is on an image --
! in that case, don't go back. */
! if (IT_CHARPOS (it) > it_start && XINT (lines) > 0 && !start_on_image_p)
move_it_by_lines (&it, -1, 0);
it.vpos = 0;