[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117299: * dispextern.h (PREPARE_FACE_FOR_DISPLAY):
|
From: |
Dmitry Antipov |
|
Subject: |
[Emacs-diffs] trunk r117299: * dispextern.h (PREPARE_FACE_FOR_DISPLAY): Remove as a duplicate of ... |
|
Date: |
Tue, 10 Jun 2014 03:14:16 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117299
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2014-06-10 07:13:41 +0400
message:
* 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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/dispextern.h
dispextern.h-20091113204419-o5vbwnq5f7feedwu-218
src/fringe.c fringe.c-20091113204419-o5vbwnq5f7feedwu-2965
src/w32term.c w32term.c-20091113204419-o5vbwnq5f7feedwu-950
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
src/xfaces.c xfaces.c-20091113204419-o5vbwnq5f7feedwu-560
src/xterm.c xterm.c-20091113204419-o5vbwnq5f7feedwu-244
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-06-09 20:31:06 +0000
+++ b/src/ChangeLog 2014-06-10 03:13:41 +0000
@@ -1,3 +1,10 @@
+2014-06-10 Dmitry Antipov <address@hidden>
+
+ * 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.
+
2014-06-09 Paul Eggert <address@hidden>
Say (accept-process-output P)'s result pertains to P if P is non-nil.
=== modified file 'src/dispextern.h'
--- a/src/dispextern.h 2014-06-08 18:27:22 +0000
+++ b/src/dispextern.h 2014-06-10 03:13:41 +0000
@@ -1795,16 +1795,6 @@
bool_bf menu_face_changed_p : 1;
};
-
-/* Prepare face FACE for use on frame F. This must be called before
- using X resources of FACE. */
-
-#define PREPARE_FACE_FOR_DISPLAY(F, FACE) \
- do { \
- if ((FACE)->gc == 0) \
- prepare_face_for_display ((F), (FACE)); \
- } while (false)
-
/* Return a pointer to the face with ID on frame F, or null if such a
face doesn't exist. */
@@ -3354,7 +3344,9 @@
enum lface_attribute_index);
char *choose_face_font (struct frame *, Lisp_Object *, Lisp_Object,
int *);
+#ifdef HAVE_WINDOW_SYSTEM
void prepare_face_for_display (struct frame *, struct face *);
+#endif
int lookup_named_face (struct frame *, Lisp_Object, int);
int lookup_basic_face (struct frame *, int);
int smaller_face (struct frame *, int, int);
=== modified file 'src/fringe.c'
--- a/src/fringe.c 2014-06-08 18:27:22 +0000
+++ b/src/fringe.c 2014-06-10 03:13:41 +0000
@@ -634,7 +634,7 @@
return;
}
- PREPARE_FACE_FOR_DISPLAY (f, p.face);
+ prepare_face_for_display (f, p.face);
/* Clear left fringe if no bitmap to draw or if bitmap doesn't fill
the fringe. */
=== modified file 'src/w32term.c'
--- a/src/w32term.c 2014-06-04 14:59:09 +0000
+++ b/src/w32term.c 2014-06-10 03:13:41 +0000
@@ -1000,7 +1000,7 @@
else
face_id = FACE_FOR_CHAR (s->f, face, 0, -1, Qnil);
s->face = FACE_FROM_ID (s->f, face_id);
- PREPARE_FACE_FOR_DISPLAY (s->f, s->face);
+ prepare_face_for_display (s->f, s->face);
/* If font in this face is same as S->font, use it. */
if (s->font == s->face->font)
@@ -1050,7 +1050,7 @@
static inline void
x_set_glyph_string_gc (struct glyph_string *s)
{
- PREPARE_FACE_FOR_DISPLAY (s->f, s->face);
+ prepare_face_for_display (s->f, s->face);
if (s->hl == DRAW_NORMAL_TEXT)
{
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2014-06-08 18:27:22 +0000
+++ b/src/xdisp.c 2014-06-10 03:13:41 +0000
@@ -23680,7 +23680,7 @@
#endif
{
eassert (face != NULL);
- PREPARE_FACE_FOR_DISPLAY (f, face);
+ prepare_face_for_display (f, face);
}
return face;
@@ -23703,7 +23703,7 @@
/* Make sure X resources of the face are allocated. */
eassert (face != NULL);
- PREPARE_FACE_FOR_DISPLAY (f, face);
+ prepare_face_for_display (f, face);
if (two_byte_p)
*two_byte_p = 0;
@@ -24020,7 +24020,7 @@
s->ybase += voffset;
/* The case that face->gc == 0 is handled when drawing the glyph
- string by calling PREPARE_FACE_FOR_DISPLAY. */
+ string by calling prepare_face_for_display. */
eassert (s->face);
return glyph - s->row->glyphs[s->area];
}
@@ -24969,7 +24969,7 @@
face = FACE_FROM_ID (it->f, it->face_id);
eassert (face);
/* Make sure X resources of the face is loaded. */
- PREPARE_FACE_FOR_DISPLAY (it->f, face);
+ prepare_face_for_display (it->f, face);
if (it->image_id < 0)
{
@@ -25247,7 +25247,7 @@
{
struct face *face = FACE_FROM_ID (it->f, it->face_id);
font = face->font ? face->font : FRAME_FONT (it->f);
- PREPARE_FACE_FOR_DISPLAY (it->f, face);
+ prepare_face_for_display (it->f, face);
}
#endif
@@ -25711,7 +25711,7 @@
face = FACE_FROM_ID (it->f, face_id);
font = face->font ? face->font : FRAME_FONT (it->f);
- PREPARE_FACE_FOR_DISPLAY (it->f, face);
+ prepare_face_for_display (it->f, face);
if (it->glyphless_method == GLYPHLESS_DISPLAY_ACRONYM)
{
=== modified file 'src/xfaces.c'
--- a/src/xfaces.c 2014-06-08 18:27:22 +0000
+++ b/src/xfaces.c 2014-06-10 03:13:41 +0000
@@ -4098,15 +4098,15 @@
}
}
+#ifdef HAVE_WINDOW_SYSTEM
-/* Prepare face FACE for subsequent display on frame F. This
- allocated GCs if they haven't been allocated yet or have been freed
- by clearing the face cache. */
+/* Prepare face FACE for subsequent display on frame F. This must be called
+ before using X resources of FACE to allocate GCs if they haven't been
+ allocated yet or have been freed by clearing the face cache. */
void
prepare_face_for_display (struct frame *f, struct face *face)
{
-#ifdef HAVE_WINDOW_SYSTEM
eassert (FRAME_WINDOW_P (f));
if (face->gc == 0)
@@ -4134,10 +4134,10 @@
font_prepare_for_face (f, face);
unblock_input ();
}
+}
+
#endif /* HAVE_WINDOW_SYSTEM */
-}
-
/* Returns the `distance' between the colors X and Y. */
static int
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2014-06-06 01:11:26 +0000
+++ b/src/xterm.c 2014-06-10 03:13:41 +0000
@@ -903,7 +903,7 @@
else
face_id = FACE_FOR_CHAR (s->f, face, 0, -1, Qnil);
s->face = FACE_FROM_ID (s->f, face_id);
- PREPARE_FACE_FOR_DISPLAY (s->f, s->face);
+ prepare_face_for_display (s->f, s->face);
if (s->font == s->face->font)
s->gc = s->face->gc;
@@ -951,7 +951,7 @@
static void
x_set_glyph_string_gc (struct glyph_string *s)
{
- PREPARE_FACE_FOR_DISPLAY (s->f, s->face);
+ prepare_face_for_display (s->f, s->face);
if (s->hl == DRAW_NORMAL_TEXT)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117299: * dispextern.h (PREPARE_FACE_FOR_DISPLAY): Remove as a duplicate of ...,
Dmitry Antipov <=