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).

1 files changed, 16 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f947b5aeef6..2b22a2e07ff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * 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 (Bug#7517).
+        (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).
+
 2011-01-03  Eli Zaretskii  <eliz@gnu.org>
 
         * image.c (png_jmpbuf): Remove definition.