diff options
| author | Dmitry Antipov | 2014-03-31 11:13:58 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-03-31 11:13:58 +0400 |
| commit | 68712e08458dabb4c2b48b6f6879466e476bd5ce (patch) | |
| tree | aa18b50b0faf669fa7517ad98e284226311f59cc /src/w32term.c | |
| parent | abe133666d5703307ee6e5485578d37a1d6093f2 (diff) | |
| download | emacs-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/w32term.c')
| -rw-r--r-- | src/w32term.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/w32term.c b/src/w32term.c index 256d7506a3a..40c1e591233 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -1078,10 +1078,7 @@ x_set_glyph_string_gc (struct glyph_string *s) | |||
| 1078 | s->stippled_p = s->face->stipple != 0; | 1078 | s->stippled_p = s->face->stipple != 0; |
| 1079 | } | 1079 | } |
| 1080 | else | 1080 | else |
| 1081 | { | 1081 | emacs_abort (); |
| 1082 | s->gc = s->face->gc; | ||
| 1083 | s->stippled_p = s->face->stipple != 0; | ||
| 1084 | } | ||
| 1085 | 1082 | ||
| 1086 | /* GC must have been set. */ | 1083 | /* GC must have been set. */ |
| 1087 | eassert (s->gc != 0); | 1084 | eassert (s->gc != 0); |