[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2]
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2] |
Date: |
Sat, 29 May 2004 01:14:16 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.843.2.13 emacs/src/xdisp.c:1.843.2.14
*** emacs/src/xdisp.c:1.843.2.13 Fri Apr 16 12:50:51 2004
--- emacs/src/xdisp.c Sat May 29 02:11:25 2004
***************
*** 17923,17930 ****
abort (); \
} \
\
! set_glyph_string_background_width (s, START, LAST_X); \
! (X) += s->width; \
} \
} \
while (0)
--- 17923,17933 ----
abort (); \
} \
\
! if (s) \
! { \
! set_glyph_string_background_width (s, START, LAST_X); \
! (X) += s->width; \
! } \
} \
} \
while (0)
***************
*** 18819,18825 ****
here we check only the font of the first glyph. This leads
to incorrect display, but it's very rare, and C-l (recenter)
can correct the display anyway. */
! if (cmp->font != (void *) font)
{
/* Ascent and descent of the font of the first character of
this composition (adjusted by baseline offset). Ascent
--- 18822,18833 ----
here we check only the font of the first glyph. This leads
to incorrect display, but it's very rare, and C-l (recenter)
can correct the display anyway. */
! if (cmp->glyph_len == 0)
! {
! cmp->lbearing = cmp->rbearing = 0;
! cmp->pixel_width = cmp->ascent = cmp->descent = 0;
! }
! else if (cmp->font != (void *) font)
{
/* Ascent and descent of the font of the first character of
this composition (adjusted by baseline offset). Ascent
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2],
Kenichi Handa <=