Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
14a7cabf
Commit
14a7cabf
authored
Sep 26, 2006
by
Chong Yidong
Browse files
* indent.c (Fvertical_motion): Do move back if the Lisp string
being displayed contains newlines.
parent
90e93246
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
7 deletions
+28
-7
src/ChangeLog
src/ChangeLog
+5
-0
src/indent.c
src/indent.c
+23
-7
No files found.
src/ChangeLog
View file @
14a7cabf
2006-09-26 Chong Yidong <cyd@stupidchicken.com>
* indent.c (Fvertical_motion): Do move back if the Lisp string
being displayed contains newlines.
2006-09-26 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* macterm.c (mac_compute_glyph_string_overhangs, XLoadQueryFont)
...
...
src/indent.c
View file @
14a7cabf
...
...
@@ -2074,7 +2074,7 @@ whether or not it is currently displayed in some window. */)
{
int
it_start
;
int
oselective
;
int
start_on_image_or_stretch_or_string
_p
;
int
it_overshoot_expected
_p
;
SET_TEXT_POS
(
pt
,
PT
,
PT_BYTE
);
start_display
(
&
it
,
w
,
pt
);
...
...
@@ -2086,9 +2086,26 @@ whether or not it is currently displayed in some window. */)
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_or_string_p
=
(
it
.
method
==
GET_FROM_IMAGE
||
it
.
method
==
GET_FROM_STRETCH
||
it
.
method
==
GET_FROM_STRING
);
/* We expect the call to move_it_to, further down, to overshoot
if the starting point is on an image, stretch glyph, or Lisp
string. We won't need to backtrack in this situation, except
for one corner case: when the Lisp string contains a
newline. */
if
(
it
.
method
==
GET_FROM_STRING
)
{
const
char
*
s
=
SDATA
(
it
.
string
);
const
char
*
e
=
s
+
SBYTES
(
it
.
string
);
while
(
s
<
e
&&
*
s
!=
'\n'
)
++
s
;
it_overshoot_expected_p
=
(
s
==
e
);
}
else
it_overshoot_expected_p
=
(
it
.
method
==
GET_FROM_IMAGE
||
it
.
method
==
GET_FROM_STRETCH
);
reseat_at_previous_visible_line_start
(
&
it
);
it
.
current_x
=
it
.
hpos
=
0
;
/* Temporarily disable selective display so we don't move too far */
...
...
@@ -2099,10 +2116,9 @@ whether or not it is currently displayed in some window. */)
/* 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, stretch
glyph, or string -- in that case, don't go back. */
Don't go back if the overshoot is expected (see above). */
if
(
IT_CHARPOS
(
it
)
>
it_start
&&
XINT
(
lines
)
>
0
&&
!
start_on_image_or_stretch_or_string
_p
)
&&
!
it_overshoot_expected
_p
)
move_it_by_lines
(
&
it
,
-
1
,
0
);
it
.
vpos
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment