Mercurial > emacs
diff src/coding.h @ 112237:ca0df3b7fb20
Backport bug 7517 fixes from trunk.
* coding.h (ENCODE_UTF_8): Remove "Used by ..." comment.
* nsfns.m (ns_set_name_iconic): Remove.
(ns_get_screen): Don't assign integer to f.
(ns_set_name_internal): New function.
(Vicon_title_format): Extern declare.
(ns_set_name): Call ns_set_name_internal.
(x_explicitly_set_name): Remove call to ns_set_name_iconic.
(x_implicitly_set_name): Ditto.
(x_set_title): Remove commet about EXPLICIT. Call ns_set_name_internal.
(ns_set_name_as_filename): Encode name with ENCODE_UTF_8.
Always use buffer name for title and buffer filename only for
RepresentedFilename. Handle bad UTF-8 in buffer name (Bug#7517).
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Mon, 03 Jan 2011 22:26:22 +0100 |
parents | 376148b31b5e |
children |
line wrap: on
line diff
--- a/src/coding.h Mon Jan 03 21:32:41 2011 +0200 +++ b/src/coding.h Mon Jan 03 22:26:22 2011 +0100 @@ -686,8 +686,7 @@ ? code_convert_string_norecord (str, Vlocale_coding_system, 0) \ : str) -/* Used by the gtk menu code. Note that this encodes utf-8, not - utf-8-emacs, so it's not a no-op. */ +/* Note that this encodes utf-8, not utf-8-emacs, so it's not a no-op. */ #define ENCODE_UTF_8(str) code_convert_string_norecord (str, Qutf_8, 1) /* Extern declarations. */