Mercurial > emacs
comparison src/indent.c @ 90667:dbe3f29e61d6
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 505-522)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: etc/TUTORIAL.cn: Updated.
- Merge from erc--emacs--22
* gnus--rel--5.10 (patch 164-167)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 21 Nov 2006 08:56:38 +0000 |
parents | bb0e318b7c53 4cb12ab18c21 |
children | 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
90666:00d54c8fa693 | 90667:dbe3f29e61d6 |
---|---|
2086 while the end position is really at some X > 0, the same X that | 2086 while the end position is really at some X > 0, the same X that |
2087 PT had. */ | 2087 PT had. */ |
2088 it_start = IT_CHARPOS (it); | 2088 it_start = IT_CHARPOS (it); |
2089 | 2089 |
2090 /* We expect the call to move_it_to, further down, to overshoot | 2090 /* We expect the call to move_it_to, further down, to overshoot |
2091 if the starting point is on an image, stretch glyph, or Lisp | 2091 if the starting point is on an image, stretch glyph, |
2092 string. We won't need to backtrack in this situation, except | 2092 composition, or Lisp string. We won't need to backtrack in |
2093 for one corner case: when the Lisp string contains a | 2093 this situation, except for one corner case: when the Lisp |
2094 newline. */ | 2094 string contains a newline. */ |
2095 if (it.method == GET_FROM_STRING) | 2095 if (it.method == GET_FROM_STRING) |
2096 { | 2096 { |
2097 const char *s = SDATA (it.string); | 2097 const char *s = SDATA (it.string); |
2098 const char *e = s + SBYTES (it.string); | 2098 const char *e = s + SBYTES (it.string); |
2099 | 2099 |
2102 | 2102 |
2103 it_overshoot_expected_p = (s == e); | 2103 it_overshoot_expected_p = (s == e); |
2104 } | 2104 } |
2105 else | 2105 else |
2106 it_overshoot_expected_p = (it.method == GET_FROM_IMAGE | 2106 it_overshoot_expected_p = (it.method == GET_FROM_IMAGE |
2107 || it.method == GET_FROM_STRETCH); | 2107 || it.method == GET_FROM_STRETCH |
2108 || it.method == GET_FROM_COMPOSITION); | |
2108 | 2109 |
2109 reseat_at_previous_visible_line_start (&it); | 2110 reseat_at_previous_visible_line_start (&it); |
2110 it.current_x = it.hpos = 0; | 2111 it.current_x = it.hpos = 0; |
2111 /* Temporarily disable selective display so we don't move too far */ | 2112 /* Temporarily disable selective display so we don't move too far */ |
2112 oselective = it.selective; | 2113 oselective = it.selective; |