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
cc320f07
Commit
cc320f07
authored
Jan 15, 2010
by
Kenichi Handa
Browse files
xdisp.c (CHAR_COMPOSED_P): New arg END_CHARPOS. Callers changed.
parent
d12bd917
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
src/ChangeLog
src/ChangeLog
+4
-0
src/xdisp.c
src/xdisp.c
+6
-5
No files found.
src/ChangeLog
View file @
cc320f07
2010-01-15 Kenichi Handa <handa@m17n.org>
* xdisp.c (CHAR_COMPOSED_P): New arg END_CHARPOS. Callers changed.
2010-01-14 Kenichi Handa <handa@m17n.org>
* coding.c (detect_coding_iso_2022): Fix handling of euc-xx coding
...
...
src/xdisp.c
View file @
cc320f07
...
...
@@ -5638,11 +5638,11 @@ static int (* get_next_element[NUM_IT_METHODS]) P_ ((struct it *it)) =
/* Return 1 iff a character at CHARPOS (and BYTEPOS) is composed
(possibly with the following characters). */
#define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS)
\
#define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS
,END_CHARPOS
) \
((IT)->cmp_it.id >= 0 \
|| ((IT)->cmp_it.stop_pos == (CHARPOS) \
&& composition_reseat_it (&(IT)->cmp_it, CHARPOS, BYTEPOS, \
(IT)->end_charpos
, (IT)->w, \
END_CHARPOS
, (IT)->w,
\
FACE_FROM_ID ((IT)->f, (IT)->face_id), \
(IT)->string)))
...
...
@@ -6300,7 +6300,7 @@ next_element_from_string (it)
return 0;
}
else if (CHAR_COMPOSED_P (it, IT_STRING_CHARPOS (*it),
IT_STRING_BYTEPOS (*it))
IT_STRING_BYTEPOS (*it)
, SCHARS (it->string)
)
&& next_element_from_composition (it))
{
return 1;
...
...
@@ -6336,7 +6336,7 @@ next_element_from_string (it)
CHARPOS (position) = BYTEPOS (position) = -1;
}
else if (CHAR_COMPOSED_P (it, IT_STRING_CHARPOS (*it),
IT_STRING_BYTEPOS (*it))
IT_STRING_BYTEPOS (*it)
, it->string_nchars
)
&& next_element_from_composition (it))
{
return 1;
...
...
@@ -6523,7 +6523,8 @@ next_element_from_buffer (it)
&& IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos)
run_redisplay_end_trigger_hook (it);
if (CHAR_COMPOSED_P (it, IT_CHARPOS (*it), IT_BYTEPOS (*it))
if (CHAR_COMPOSED_P (it, IT_CHARPOS (*it), IT_BYTEPOS (*it),
it->end_charpos)
&& next_element_from_composition (it))
{
return 1;
...
...
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