aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-06 00:14:14 -0800
committerPaul Eggert2011-03-06 00:14:14 -0800
commit841081e175e461e5b8e94747aff3fd108eff3cad (patch)
tree82ba06237a1ebd9015e8312e2b96655cc2144a5b /src
parent7b781e9f4f8f6899451b68117cd47b7c40250354 (diff)
downloademacs-841081e175e461e5b8e94747aff3fd108eff3cad.tar.gz
emacs-841081e175e461e5b8e94747aff3fd108eff3cad.zip
* xdisp.c (produce_glyphless_glyph): Make a pointer "const"
since it might point to immutable storage.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xdisp.c3
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 @@
9 (mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame): 9 (mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame):
10 Rename or move local decls. 10 Rename or move local decls.
11 * xdisp.c (BUILD_GLYPHLESS_GLYPH_STRING): Omit unused local var. 11 * xdisp.c (BUILD_GLYPHLESS_GLYPH_STRING): Omit unused local var.
12 (produce_glyphless_glyph): Make a pointer "const"
13 since it might point to immutable storage.
12 14
132011-03-06 Michael Shields <shields@msrl.com> (tiny change) 152011-03-06 Michael Shields <shields@msrl.com> (tiny change)
14 16
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)
22267 } 22267 }
22268 else 22268 else
22269 { 22269 {
22270 char buf[7], *str; 22270 char buf[7];
22271 const char *str;
22271 unsigned int code[6]; 22272 unsigned int code[6];
22272 int upper_len; 22273 int upper_len;
22273 int ascent, descent; 22274 int ascent, descent;