2 files changed, 4 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5dd7a774ddb..0ebc363f451 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,6 +9,8 @@
         (mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame):
         Rename or move local decls.
         * xdisp.c (BUILD_GLYPHLESS_GLYPH_STRING): Omit unused local var.
+        (produce_glyphless_glyph): Make a pointer "const"
+        since it might point to immutable storage.
 
 2011-03-06  Michael Shields  <shields@msrl.com>  (tiny change)
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 8cdb590ae9e..818c4c36e52 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22267,7 +22267,8 @@ produce_glyphless_glyph (struct it *it, int for_no_font, Lisp_Object acronym)
     }
   else
     {
-      char buf[7], *str;
+      char buf[7];
+      const char *str;
       unsigned int code[6];
       int upper_len;
       int ascent, descent;