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
6185b3db
Commit
6185b3db
authored
Jun 23, 2006
by
Kim F. Storm
Browse files
(handle_composition_prop): Push iterator on stack.
(set_iterator_to_next): Pop iterator at end of composition.
parent
8800bd5c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
src/xdisp.c
src/xdisp.c
+6
-4
No files found.
src/xdisp.c
View file @
6185b3db
...
...
@@ -4487,6 +4487,8 @@ handle_composition_prop (it)
}
return HANDLED_RECOMPUTE_PROPS;
}
push_it (it);
it->method = GET_FROM_COMPOSITION;
it->cmp_id = id;
it->cmp_len = COMPOSITION_LENGTH (prop);
...
...
@@ -5791,19 +5793,19 @@ set_iterator_to_next (it, reseat_p)
case GET_FROM_COMPOSITION:
xassert (it->cmp_id >= 0 && it->cmp_id < n_compositions);
if (STRINGP (it->string))
xassert (it->sp > 0);
pop_it (it);
if (it->method == GET_FROM_STRING)
{
IT_STRING_BYTEPOS (*it) += it->len;
IT_STRING_CHARPOS (*it) += it->cmp_len;
it->method = GET_FROM_STRING;
it->object = it->string;
goto consider_string_end;
}
else
else
if (it->method == GET_FROM_BUFFER)
{
IT_BYTEPOS (*it) += it->len;
IT_CHARPOS (*it) += it->cmp_len;
it->method = GET_FROM_BUFFER;
it->object = it->w->buffer;
}
break;
...
...
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