summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/ns-win.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21867a352b0..86a27f9b5bd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-02 Jan Djärv <jan.h.d@swipnet.se>
+
+ * term/ns-win.el (display-format-alist): Use .* (Bug#14765).
+
2013-07-01 Katsumi Yamaoka <yamaoka@jpl.org>
* wid-edit.el (widget-default-get): Don't modify widget (Bug#14738).
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 0298ad81a34..b92ca1244fb 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -940,7 +940,8 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
(x-apply-session-resources)
(setq ns-initialized t))
-(add-to-list 'display-format-alist '("\\`ns\\'" . ns))
+;; Any display name is OK.
+(add-to-list 'display-format-alist '(".*" . ns))
(add-to-list 'handle-args-function-alist '(ns . x-handle-args))
(add-to-list 'frame-creation-function-alist '(ns . x-create-frame-with-faces))
(add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system))