HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typos.
[bpt/emacs.git]
/
src
/
composite.c
diff --git
a/src/composite.c
b/src/composite.c
index
2a3fbe2
..
885e026
100644
(file)
--- a/
src/composite.c
+++ b/
src/composite.c
@@
-345,6
+345,8
@@
get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars,
{
int this_width;
ch = XINT (key_contents[i]);
{
int this_width;
ch = XINT (key_contents[i]);
+ /* TAB in a composition means display glyphs with padding
+ space on the left or right. */
this_width = (ch == '\t' ? 1 : CHAR_WIDTH (ch));
if (cmp->width < this_width)
cmp->width = this_width;
this_width = (ch == '\t' ? 1 : CHAR_WIDTH (ch));
if (cmp->width < this_width)
cmp->width = this_width;
@@
-1305,7
+1307,7
@@
composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
if (cmp_it->lookback == 0)
goto no_composition;
lgstring = Qnil;
if (cmp_it->lookback == 0)
goto no_composition;
lgstring = Qnil;
- /* Try to find a shorter compostion that starts after CPOS. */
+ /* Try to find a shorter compos
i
tion that starts after CPOS. */
composition_compute_stop_pos (cmp_it, charpos, bytepos, cpos,
string);
if (cmp_it->ch == -2 || cmp_it->stop_pos < charpos)
composition_compute_stop_pos (cmp_it, charpos, bytepos, cpos,
string);
if (cmp_it->ch == -2 || cmp_it->stop_pos < charpos)
@@
-1384,6
+1386,8
@@
composition_update_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
else
{
for (i = 0; i < cmp->glyph_len; i++)
else
{
for (i = 0; i < cmp->glyph_len; i++)
+ /* TAB in a composition means display glyphs with padding
+ space on the left or right. */
if ((c = COMPOSITION_GLYPH (cmp, i)) != '\t')
break;
if (c == '\t')
if ((c = COMPOSITION_GLYPH (cmp, i)) != '\t')
break;
if (c == '\t')