diff options
| author | Jan Djärv | 2013-09-29 19:09:39 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-09-29 19:09:39 +0200 |
| commit | 832966e57f6290e09bb5b477f4d947df53c230d0 (patch) | |
| tree | 32b922cebb7d28231d05580909f793fcbeea8c81 | |
| parent | 92e5298badf4683f345de10710b680bd1c302df5 (diff) | |
| download | emacs-832966e57f6290e09bb5b477f4d947df53c230d0.tar.gz emacs-832966e57f6290e09bb5b477f4d947df53c230d0.zip | |
* term/ns-win.el (ns-initialize-window-system): Set locale-coding-system
and default-process-coding-system to utf-8-unix.
Fixes: debbugs:15402
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9395df089bb..3da4cef6952 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-09-29 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * term/ns-win.el (ns-initialize-window-system): Set locale-coding-system | ||
| 4 | and default-process-coding-system to utf-8-unix (Bug#15402). | ||
| 5 | |||
| 1 | 2013-09-29 Xue Fuqiao <xfq.free@gmail.com> | 6 | 2013-09-29 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 7 | ||
| 3 | * subr.el (looking-back): Do not recommend using looking-back. | 8 | * subr.el (looking-back): Do not recommend using looking-back. |
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 53c602048ff..91849dbbdcf 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el | |||
| @@ -912,6 +912,13 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") | |||
| 912 | ;; FIXME: This will surely lead to "MODIFIED OUTSIDE CUSTOM" warnings. | 912 | ;; FIXME: This will surely lead to "MODIFIED OUTSIDE CUSTOM" warnings. |
| 913 | (menu-bar-mode (if (get-lisp-resource nil "Menus") 1 -1)) | 913 | (menu-bar-mode (if (get-lisp-resource nil "Menus") 1 -1)) |
| 914 | 914 | ||
| 915 | ;; For NS nothing except UTF-8 makes sense. | ||
| 916 | (add-hook 'before-init-hook | ||
| 917 | #'(lambda () | ||
| 918 | (setq locale-coding-system 'utf-8-unix) | ||
| 919 | (setq default-process-coding-system | ||
| 920 | '(utf-8-unix . utf-8-unix)))) | ||
| 921 | |||
| 915 | ;; OS X Lion introduces PressAndHold, which is unsupported by this port. | 922 | ;; OS X Lion introduces PressAndHold, which is unsupported by this port. |
| 916 | ;; See this thread for more details: | 923 | ;; See this thread for more details: |
| 917 | ;; http://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html | 924 | ;; http://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html |