Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
cc6c7c75
Commit
cc6c7c75
authored
Feb 25, 2010
by
Kenichi Handa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xdisp.c (reseat_to_string): Fix previous change (bug#5609).
parent
0ca10bb7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
src/ChangeLog
src/ChangeLog
+4
-0
src/xdisp.c
src/xdisp.c
+7
-2
No files found.
src/ChangeLog
View file @
cc6c7c75
2010-02-25 Kenichi Handa <handa@m17n.org>
* xdisp.c (reseat_to_string): Fix previous change (bug#5609).
2010-02-24 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (XTflash): Move declarations before statements.
...
...
src/xdisp.c
View file @
cc6c7c75
...
...
@@ -5610,8 +5610,13 @@ reseat_to_string (it, s, string, charpos, precision, field_width, multibyte)
it->stop_charpos = charpos;
if (s == NULL && it->multibyte_p)
composition_compute_stop_pos (&it->cmp_it, charpos, -1, it->end_charpos,
it->string);
{
EMACS_INT endpos = charpos + SCHARS (it->string);
if (endpos > it->end_charpos)
endpos = it->end_charpos;
composition_compute_stop_pos (&it->cmp_it, charpos, -1, endpos,
it->string);
}
CHECK_IT (it);
}
...
...
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