diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-05-30 11:17:56 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-05-30 11:19:31 -0700 |
commit | 75f8653bfe0da39acca9dbcb8b021ad033ac6ae9 (patch) | |
tree | 13d34ab47fac65374d374a7ea8e9d9b220b16f3f /src/doc.c | |
parent | 85aa6ede9fe1b8165a99a4046dd8262ec93a02d5 (diff) | |
download | emacs-75f8653bfe0da39acca9dbcb8b021ad033ac6ae9.tar.gz emacs-75f8653bfe0da39acca9dbcb8b021ad033ac6ae9.tar.bz2 emacs-75f8653bfe0da39acca9dbcb8b021ad033ac6ae9.zip |
Don't misencode C-generated messages
Also, be more consistent about calls to 'Fmessage' vs 'message'.
* src/alloc.c (Fgc_status):
Prefer AUTO_STRING to build_string for Fmessage call.
* src/data.c (Fmake_variable_buffer_local)
(Fmake_local_variable, Fmake_variable_frame_local):
* src/doc.c (store_function_docstring):
Use Fmessage, not message, since the argument can contain
non-ASCII characters, and this can cause the resulting message
to be incorrectly encoded for the current environment.
* src/fns.c (maybe_resize_hash_table):
* src/xselect.c (x_clipboard_manager_save_all):
Use message, not Fmessage, since Fmessage's power isn't needed here.
* src/process.c (Fmake_network_process): Reword message to avoid %s.
* src/xdisp.c (vmessage): Document restrictions on message contents.
(message_nolog) [false]: Remove unused code.
Diffstat (limited to 'src/doc.c')
-rw-r--r-- | src/doc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/doc.c b/src/doc.c index 32d65563fd9..f1ba64359a6 100644 --- a/src/doc.c +++ b/src/doc.c @@ -516,8 +516,13 @@ store_function_docstring (Lisp_Object obj, ptrdiff_t offset) if ((ASIZE (fun) & PSEUDOVECTOR_SIZE_MASK) > COMPILED_DOC_STRING) ASET (fun, COMPILED_DOC_STRING, make_number (offset)); else - message ("No docstring slot for %s", - SYMBOLP (obj) ? SSDATA (SYMBOL_NAME (obj)) : "<anonymous>"); + { + AUTO_STRING (format, "No docstring slot for %s"); + CALLN (Fmessage, format, + (SYMBOLP (obj) + ? SYMBOL_NAME (obj) + : build_string ("<anonymous>"))); + } } } |