aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-06-08 10:50:17 -0700
committerPaul Eggert2012-06-08 10:50:17 -0700
commitd86feb1764fdd8f02ba1ba9b32441ddd902be676 (patch)
tree0b3bac228ce554a5f88b4476db7278f89f249409
parentee5747918fd72e3ced7bc59949d5e40c84144804 (diff)
downloademacs-d86feb1764fdd8f02ba1ba9b32441ddd902be676.tar.gz
emacs-d86feb1764fdd8f02ba1ba9b32441ddd902be676.zip
* xdisp.c (vmessage): Treat frame message as multibyte.
Without this change, (let ((§ 1)) (make-variable-buffer-local '§)) would generate the diagnostic "Making \302\247 buffer-local while let-bound!".
-rw-r--r--src/ChangeLog7
-rw-r--r--src/xdisp.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a05f6a3a4b5..4d93c65fa1f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12012-06-08 Paul Eggert <eggert@cs.ucla.edu>
2
3 * xdisp.c (vmessage): Treat frame message as multibyte.
4 Without this change, (let ((§ 1)) (make-variable-buffer-local '§))
5 would generate the diagnostic "Making \302\247 buffer-local while
6 let-bound!".
7
12012-06-08 Eli Zaretskii <eliz@gnu.org> 82012-06-08 Eli Zaretskii <eliz@gnu.org>
2 9
3 * dispnew.c (showing_window_margins_p): Undo last change, which 10 * dispnew.c (showing_window_margins_p): Undo last change, which
diff --git a/src/xdisp.c b/src/xdisp.c
index 5bb1b6deb9f..0eae25de54a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9765,7 +9765,7 @@ vmessage (const char *m, va_list ap)
9765 len = doprnt (FRAME_MESSAGE_BUF (f), 9765 len = doprnt (FRAME_MESSAGE_BUF (f),
9766 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, ap); 9766 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, ap);
9767 9767
9768 message2 (FRAME_MESSAGE_BUF (f), len, 0); 9768 message2 (FRAME_MESSAGE_BUF (f), len, 1);
9769 } 9769 }
9770 else 9770 else
9771 message1 (0); 9771 message1 (0);