(message_with_string): Error if STRING is not a string.

diff --git a/src/ChangeLog b/src/ChangeLog
index ad9cfaa409fdd54cfe5985e9f71bdd6b78b46c8a..4e6790ffae5f27ae0b48ef657f7cdd7e6451ea68 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-30  John Paul Wallington  <jpw@shootybangbang.com>
+
+       * xdisp.c (message_with_string): Error if STRING is not a string.
+
 2002-10-25  Kenichi Handa  <handa@m17n.org>
 
        * xfns.c (x_set_name): Encode by Qcompound_text unconditionally.

diff --git a/src/xdisp.c b/src/xdisp.c
index 5079daa30e0fd21479a6727ab794403c4aea60d4..70d590c30bf372766f632567be164eb7907112d9 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6032,6 +6032,8 @@ message_with_string (m, string, log)
      Lisp_Object string;
      int log;
 {
+  CHECK_STRING (string, 0);
+
   if (noninteractive)
     {
       if (m)