diff options
| author | Jan Djärv | 2013-07-02 20:16:09 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-07-02 20:16:09 +0200 |
| commit | a3b49114c186d84404226af75ae7905bd1cd018f (patch) | |
| tree | f415e073991f3ae524e4e3fe3849d48f0dbcf4a3 | |
| parent | 57f8c49045c8c37000f76c632b480f66201520db (diff) | |
| download | emacs-a3b49114c186d84404226af75ae7905bd1cd018f.tar.gz emacs-a3b49114c186d84404226af75ae7905bd1cd018f.zip | |
* term/ns-win.el (display-format-alist): Use .*.
Fixes: debbugs:14765
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 3 |
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 @@ | |||
| 1 | 2013-07-02 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * term/ns-win.el (display-format-alist): Use .* (Bug#14765). | ||
| 4 | |||
| 1 | 2013-07-01 Katsumi Yamaoka <yamaoka@jpl.org> | 5 | 2013-07-01 Katsumi Yamaoka <yamaoka@jpl.org> |
| 2 | 6 | ||
| 3 | * wid-edit.el (widget-default-get): Don't modify widget (Bug#14738). | 7 | * 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.") | |||
| 940 | (x-apply-session-resources) | 940 | (x-apply-session-resources) |
| 941 | (setq ns-initialized t)) | 941 | (setq ns-initialized t)) |
| 942 | 942 | ||
| 943 | (add-to-list 'display-format-alist '("\\`ns\\'" . ns)) | 943 | ;; Any display name is OK. |
| 944 | (add-to-list 'display-format-alist '(".*" . ns)) | ||
| 944 | (add-to-list 'handle-args-function-alist '(ns . x-handle-args)) | 945 | (add-to-list 'handle-args-function-alist '(ns . x-handle-args)) |
| 945 | (add-to-list 'frame-creation-function-alist '(ns . x-create-frame-with-faces)) | 946 | (add-to-list 'frame-creation-function-alist '(ns . x-create-frame-with-faces)) |
| 946 | (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system)) | 947 | (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system)) |