aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorDmitry Antipov2014-03-31 11:13:58 +0400
committerDmitry Antipov2014-03-31 11:13:58 +0400
commit68712e08458dabb4c2b48b6f6879466e476bd5ce (patch)
treeaa18b50b0faf669fa7517ad98e284226311f59cc /src/xterm.c
parentabe133666d5703307ee6e5485578d37a1d6093f2 (diff)
downloademacs-68712e08458dabb4c2b48b6f6879466e476bd5ce.tar.gz
emacs-68712e08458dabb4c2b48b6f6879466e476bd5ce.zip
* search.c (Freplace_match): Use make_specified_string.
* xterm.c, w32term.c (x_set_glyph_string_gc): Use emacs_abort to catch bogus override face of glyph strings.
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 31e1b9cb74f..1c0aea01f6e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -968,10 +968,7 @@ x_set_glyph_string_gc (struct glyph_string *s)
968 s->stippled_p = s->face->stipple != 0; 968 s->stippled_p = s->face->stipple != 0;
969 } 969 }
970 else 970 else
971 { 971 emacs_abort ();
972 s->gc = s->face->gc;
973 s->stippled_p = s->face->stipple != 0;
974 }
975 972
976 /* GC must have been set. */ 973 /* GC must have been set. */
977 eassert (s->gc != 0); 974 eassert (s->gc != 0);