diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /src/xftfont.c | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/xftfont.c')
| -rw-r--r-- | src/xftfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index c27a4fcf91a..bc0c56a0fe0 100644 --- a/src/xftfont.c +++ b/src/xftfont.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* xftfont.c -- XFT font driver. | 1 | /* xftfont.c -- XFT font driver. |
| 2 | Copyright (C) 2006-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 2006-2012 Free Software Foundation, Inc. |
| 3 | Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 | 3 | Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 |
| 4 | National Institute of Advanced Industrial Science and Technology (AIST) | 4 | National Institute of Advanced Industrial Science and Technology (AIST) |
| 5 | Registration Number H13PRO009 | 5 | Registration Number H13PRO009 |
| @@ -654,7 +654,7 @@ xftfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_b | |||
| 654 | 654 | ||
| 655 | if (with_background) | 655 | if (with_background) |
| 656 | XftDrawRect (xft_draw, &bg, | 656 | XftDrawRect (xft_draw, &bg, |
| 657 | x, y - face->font->ascent, s->width, face->font->height); | 657 | x, y - s->font->ascent, s->width, s->font->height); |
| 658 | code = alloca (sizeof (FT_UInt) * len); | 658 | code = alloca (sizeof (FT_UInt) * len); |
| 659 | for (i = 0; i < len; i++) | 659 | for (i = 0; i < len; i++) |
| 660 | code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8) | 660 | code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8) |