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
15fa4783
Commit
15fa4783
authored
Jul 07, 2011
by
Kenichi Handa
Browse files
Ignore a static composition that starts before the current checking position in redisplay.
parent
38fe4016
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
0 deletions
+13
-0
src/ChangeLog
src/ChangeLog
+7
-0
src/composite.c
src/composite.c
+1
-0
src/xdisp.c
src/xdisp.c
+5
-0
No files found.
src/ChangeLog
View file @
15fa4783
2011-07-07 Kenichi Handa <handa@m17n.org>
* composite.c (composition_compute_stop_pos): Ignore a static
composition starting before CHARPOS (Bug#8915).
* xdisp.c (handle_composition_prop): Likewise.
2011-06-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* dispnew.c (scrolling_window): Before scrolling, turn off a
...
...
src/composite.c
View file @
15fa4783
...
...
@@ -1042,6 +1042,7 @@ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string)
cmp_it->id = -1;
cmp_it->ch = -2;
if (find_composition (charpos, endpos, &start, &end, &prop, string)
&& start >= charpos
&& COMPOSITION_VALID_P (start, end, prop))
{
cmp_it->stop_pos = endpos = start;
...
...
src/xdisp.c
View file @
15fa4783
...
...
@@ -4641,6 +4641,11 @@ handle_composition_prop (it)
&& COMPOSITION_VALID_P (start, end, prop)
&& (STRINGP (it->string) || (PT <= start || PT >= end)))
{
if (start < pos)
/* As we can't handle this situation (perhaps, font-lock added
a new composition), we just return here hoping that next
redisplay will detect this composition much earlier. */
return HANDLED_NORMALLY;
if (start != pos)
{
if (STRINGP (it->string))
...
...
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