diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8707c02f540..49cb49dd893 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-10-01 Jan Djärv <jan.h.d@swipnet.se> + + * term/ns-win.el (ns-initialize-window-system): Set locale-coding-system + and default-process-coding-system for darwin only. + 2013-10-01 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/package.el (package-desc): Simplify (bug#15495). diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 91849dbbdcf..bc9cab375bf 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -912,12 +912,13 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") ;; FIXME: This will surely lead to "MODIFIED OUTSIDE CUSTOM" warnings. (menu-bar-mode (if (get-lisp-resource nil "Menus") 1 -1)) - ;; For NS nothing except UTF-8 makes sense. - (add-hook 'before-init-hook - #'(lambda () - (setq locale-coding-system 'utf-8-unix) - (setq default-process-coding-system - '(utf-8-unix . utf-8-unix)))) + ;; For Darwin nothing except UTF-8 makes sense. + (when (eq system-type 'darwin) + (add-hook 'before-init-hook + #'(lambda () + (setq locale-coding-system 'utf-8-unix) + (setq default-process-coding-system + '(utf-8-unix . utf-8-unix))))) ;; OS X Lion introduces PressAndHold, which is unsupported by this port. ;; See this thread for more details: |