diff options
| author | Dmitry Antipov | 2014-06-10 07:13:41 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-06-10 07:13:41 +0400 |
| commit | 2e120be4e9871626734ba8334897488019c00cdb (patch) | |
| tree | b884de0bf1396af6648446871d487465a8484782 /src/xterm.c | |
| parent | 29993416fb4d19c1c3bb146367fc4bed74845486 (diff) | |
| download | emacs-2e120be4e9871626734ba8334897488019c00cdb.tar.gz emacs-2e120be4e9871626734ba8334897488019c00cdb.zip | |
* dispextern.h (PREPARE_FACE_FOR_DISPLAY): Remove as a duplicate of ...
* xfaces.c (prepare_face_for_display) [HAVE_WINDOW_SYSTEM]: ... this
function. Also adjust comment.
* fringe.c, w32term.c, xdisp.c, xterm.c: All users changed.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c index 8c2b6254e59..422800f3765 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -903,7 +903,7 @@ x_set_mouse_face_gc (struct glyph_string *s) | |||
| 903 | else | 903 | else |
| 904 | face_id = FACE_FOR_CHAR (s->f, face, 0, -1, Qnil); | 904 | face_id = FACE_FOR_CHAR (s->f, face, 0, -1, Qnil); |
| 905 | s->face = FACE_FROM_ID (s->f, face_id); | 905 | s->face = FACE_FROM_ID (s->f, face_id); |
| 906 | PREPARE_FACE_FOR_DISPLAY (s->f, s->face); | 906 | prepare_face_for_display (s->f, s->face); |
| 907 | 907 | ||
| 908 | if (s->font == s->face->font) | 908 | if (s->font == s->face->font) |
| 909 | s->gc = s->face->gc; | 909 | s->gc = s->face->gc; |
| @@ -951,7 +951,7 @@ x_set_mode_line_face_gc (struct glyph_string *s) | |||
| 951 | static void | 951 | static void |
| 952 | x_set_glyph_string_gc (struct glyph_string *s) | 952 | x_set_glyph_string_gc (struct glyph_string *s) |
| 953 | { | 953 | { |
| 954 | PREPARE_FACE_FOR_DISPLAY (s->f, s->face); | 954 | prepare_face_for_display (s->f, s->face); |
| 955 | 955 | ||
| 956 | if (s->hl == DRAW_NORMAL_TEXT) | 956 | if (s->hl == DRAW_NORMAL_TEXT) |
| 957 | { | 957 | { |