Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f16d9837
Commit
f16d9837
authored
May 25, 2011
by
Kenichi Handa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xdisp.c (get_next_display_element): Set correct it->face_id for a static composition.
parent
02bd5450
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
src/ChangeLog
src/ChangeLog
+5
-0
src/xdisp.c
src/xdisp.c
+14
-2
No files found.
src/ChangeLog
View file @
f16d9837
2011-05-25 Kenichi Handa <handa@m17n.org>
* xdisp.c (get_next_display_element): Set correct it->face_id for
a static composition.
2011-05-21 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* dispnew.c (scrolling_window): Don't exclude the case that the
...
...
src/xdisp.c
View file @
f16d9837
...
...
@@ -5922,9 +5922,21 @@ get_next_display_element (it)
int pos = (it->s ? -1
: STRINGP (it->string) ? IT_STRING_CHARPOS (*it)
: IT_CHARPOS (*it));
int c;
if (it->what == IT_CHARACTER)
c = it->char_to_display;
else
{
struct composition *cmp = composition_table[it->cmp_it.id];
int i;
it->face_id = FACE_FOR_CHAR (it->f, face, it->char_to_display, pos,
it->string);
c = ' ';
for (i = 0; i < cmp->glyph_len; i++)
if ((c = COMPOSITION_GLYPH (cmp, i)) != '\t')
break;
}
it->face_id = FACE_FOR_CHAR (it->f, face, c, pos, it->string);
}
}
#endif
...
...
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