From 68712e08458dabb4c2b48b6f6879466e476bd5ce Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Mon, 31 Mar 2014 11:13:58 +0400 Subject: [PATCH] * 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. --- src/ChangeLog | 6 ++++++ src/search.c | 14 ++------------ src/w32term.c | 5 +---- src/xterm.c | 5 +---- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 92be5b0024..ea34def5de 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-03-31 Dmitry Antipov + + * 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. + 2014-03-31 Jan Djärv * nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976) diff --git a/src/search.c b/src/search.c index 3de194c505..9bec825abc 100644 --- a/src/search.c +++ b/src/search.c @@ -2679,18 +2679,8 @@ since only regular expressions have distinguished subexpressions. */) } if (really_changed) - { - if (buf_multibyte) - { - ptrdiff_t nchars = - multibyte_chars_in_text (substed, substed_len); - - newtext = make_multibyte_string ((char *) substed, nchars, - substed_len); - } - else - newtext = make_unibyte_string ((char *) substed, substed_len); - } + newtext = make_specified_string ((const char *) substed, -1, + substed_len, buf_multibyte); xfree (substed); } diff --git a/src/w32term.c b/src/w32term.c index 256d7506a3..40c1e59123 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1078,10 +1078,7 @@ x_set_glyph_string_gc (struct glyph_string *s) s->stippled_p = s->face->stipple != 0; } else - { - s->gc = s->face->gc; - s->stippled_p = s->face->stipple != 0; - } + emacs_abort (); /* GC must have been set. */ eassert (s->gc != 0); diff --git a/src/xterm.c b/src/xterm.c index 31e1b9cb74..1c0aea01f6 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -968,10 +968,7 @@ x_set_glyph_string_gc (struct glyph_string *s) s->stippled_p = s->face->stipple != 0; } else - { - s->gc = s->face->gc; - s->stippled_p = s->face->stipple != 0; - } + emacs_abort (); /* GC must have been set. */ eassert (s->gc != 0); -- 2.20.1