Merge from origin/emacs-24

a3505cb doc/lispref/variables.texi (Creating Buffer-Local): Improve indexing (Bug#19608)
d132c7b erc-backend.el: Give hook-name a default value of nil and add-to-list unconditionally. Fixes debbugs:19363
61cc7bf Fix support of non-ASCII frame titles on MS-Windows  (Bug#19590)
1e5902a * filenotify.el (file-notify--descriptor): Do not cons for remote files.
b1ea160 Handle watching of several files in the same directory for inotify.

2 files changed, 53 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 422933d22f9..4a49b8b7799 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (w32_set_title_bar_text): New function, including
+        support for titles with non-ASCII characters outside of the
+        current system codepage.
+        (x_set_name, x_set_title): Use it.  (Bug#19590)
+
 2015-01-10  Eli Zaretskii  <eliz@gnu.org>
 
         * indent.c (Fvertical_motion): Return zero if we started from ZV
diff --git a/src/w32fns.c b/src/w32fns.c
index deda2eab26d..777819edd52 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1759,6 +1759,50 @@ x_change_tool_bar_height (struct frame *f, int height)
     x_clear_under_internal_border (f);
 }
 
+static void
+w32_set_title_bar_text (struct frame *f, Lisp_Object name)
+{
+  if (FRAME_W32_WINDOW (f))
+    {
+      block_input ();
+#ifdef __CYGWIN__
+      GUI_FN (SetWindowText) (FRAME_W32_WINDOW (f),
+                              GUI_SDATA (GUI_ENCODE_SYSTEM (name)));
+#else
+      /* The frame's title many times shows the name of the file
+         visited in the selected window's buffer, so it makes sense to
+         support non-ASCII characters outside of the current system
+         codepage in the title.  */
+      if (w32_unicode_filenames)
+        {
+          Lisp_Object encoded_title = ENCODE_UTF_8 (name);
+          wchar_t *title_w;
+          int tlen = pMultiByteToWideChar (CP_UTF8, 0, SSDATA (encoded_title),
+                                           -1, NULL, 0);
+
+          if (tlen > 0)
+            {
+              /* Windows truncates the title text beyond what fits on
+                 a single line, so we can limit the length to some
+                 reasonably large value, and use alloca.  */
+              if (tlen > 10000)
+                tlen = 10000;
+              title_w = alloca ((tlen + 1) * sizeof (wchar_t));
+              pMultiByteToWideChar (CP_UTF8, 0, SSDATA (encoded_title), -1,
+                                    title_w, tlen);
+              title_w[tlen] = L'\0';
+              SetWindowTextW (FRAME_W32_WINDOW (f), title_w);
+            }
+          else  /* Conversion to UTF-16 failed, so we punt.  */
+            SetWindowTextA (FRAME_W32_WINDOW (f),
+                            SSDATA (ENCODE_SYSTEM (name)));
+        }
+      else
+        SetWindowTextA (FRAME_W32_WINDOW (f), SSDATA (ENCODE_SYSTEM (name)));
+#endif
+      unblock_input ();
+    }
+}
 
 /* Change the name of frame F to NAME.  If NAME is nil, set F's name to
        w32_id_name.
@@ -1812,13 +1856,7 @@ x_set_name (struct frame *f, Lisp_Object name, bool explicit)
   if (! NILP (f->title))
     name = f->title;
 
-  if (FRAME_W32_WINDOW (f))
-    {
-      block_input ();
-      GUI_FN (SetWindowText) (FRAME_W32_WINDOW (f),
-                              GUI_SDATA (GUI_ENCODE_SYSTEM (name)));
-      unblock_input ();
-    }
+  w32_set_title_bar_text (f, name);
 }
 
 /* This function should be called when the user's lisp code has
@@ -1856,13 +1894,7 @@ x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name)
   if (NILP (name))
     name = f->name;
 
-  if (FRAME_W32_WINDOW (f))
-    {
-      block_input ();
-      GUI_FN (SetWindowText) (FRAME_W32_WINDOW (f),
-                              GUI_SDATA (GUI_ENCODE_SYSTEM (name)));
-      unblock_input ();
-    }
+  w32_set_title_bar_text (f, name);
 }
 
 void