Mercurial > emacs
changeset 72575:2cc5d85e63a1
* indent.c (Fvertical_motion): Don't move back if we were
displaying a Lisp string, either.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 29 Aug 2006 22:17:05 +0000 |
| parents | 1b6faf513fc3 |
| children | b09e6c8f23d4 |
| files | src/ChangeLog src/indent.c |
| diffstat | 2 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Aug 29 16:11:26 2006 +0000 +++ b/src/ChangeLog Tue Aug 29 22:17:05 2006 +0000 @@ -1,3 +1,8 @@ +2006-08-29 Chong Yidong <cyd@stupidchicken.com> + + * indent.c (Fvertical_motion): Don't move back if we were + displaying a Lisp string, either. + 2006-08-28 Kim F. Storm <storm@cua.dk> * xdisp.c (get_window_cursor_type) [!HAVE_WINDOW_SYSTEM]:
--- a/src/indent.c Tue Aug 29 16:11:26 2006 +0000 +++ b/src/indent.c Tue Aug 29 22:17:05 2006 +0000 @@ -2074,7 +2074,7 @@ { int it_start; int oselective; - int start_on_image_or_stretch_p; + int start_on_image_or_stretch_or_string_p; SET_TEXT_POS (pt, PT, PT_BYTE); start_display (&it, w, pt); @@ -2086,8 +2086,9 @@ while the end position is really at some X > 0, the same X that PT had. */ it_start = IT_CHARPOS (it); - start_on_image_or_stretch_p = (it.method == GET_FROM_IMAGE - || it.method == GET_FROM_STRETCH); + start_on_image_or_stretch_or_string_p = (it.method == GET_FROM_IMAGE + || it.method == GET_FROM_STRETCH + || it.method == GET_FROM_STRING); reseat_at_previous_visible_line_start (&it); it.current_x = it.hpos = 0; /* Temporarily disable selective display so we don't move too far */ @@ -2098,10 +2099,10 @@ /* 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 or a stretch - glyph -- in that case, don't go back. */ + It may also happen if it_start is on an image, stretch + glyph, or string -- in that case, don't go back. */ if (IT_CHARPOS (it) > it_start && XINT (lines) > 0 - && !start_on_image_or_stretch_p) + && !start_on_image_or_stretch_or_string_p) move_it_by_lines (&it, -1, 0); it.vpos = 0;