[Emacs-diffs] trunk r116917: * search.c (Freplace_match): Use make_specified_string.

[Dmitry Antipov]

------------------------------------------------------------
revno: 116917
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2014-03-31 11:13:58 +0400
message:
  * 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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/search.c                   search.c-20091113204419-o5vbwnq5f7feedwu-473
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-03-31 06:20:04 +0000
+++ b/src/ChangeLog     2014-03-31 07:13:58 +0000
@@ -1,3 +1,9 @@
+2014-03-31  Dmitry Antipov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976)

=== modified file 'src/search.c'
--- a/src/search.c      2014-03-16 16:28:34 +0000
+++ b/src/search.c      2014-03-31 07:13:58 +0000
@@ -2679,18 +2679,8 @@
        }
 
       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);
     }
 

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2014-03-27 17:34:22 +0000
+++ b/src/w32term.c     2014-03-31 07:13:58 +0000
@@ -1078,10 +1078,7 @@
       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);

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-03-21 19:04:57 +0000
+++ b/src/xterm.c       2014-03-31 07:13:58 +0000
@@ -968,10 +968,7 @@
       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);