emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r114491: * lisp/term/ns-win.el (ns-initialize-window


From: Jan D.
Subject: [Emacs-diffs] trunk r114491: * lisp/term/ns-win.el (ns-initialize-window-system): Set locale-coding-system
Date: Tue, 01 Oct 2013 18:22:47 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 114491
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2013-10-01 20:22:48 +0200
message:
  * lisp/term/ns-win.el (ns-initialize-window-system): Set locale-coding-system
  and default-process-coding-system for darwin only.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/term/ns-win.el            nswin.el-20091113204419-o5vbwnq5f7feedwu-8708
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-01 15:52:53 +0000
+++ b/lisp/ChangeLog    2013-10-01 18:22:48 +0000
@@ -1,3 +1,8 @@
+2013-10-01  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/package.el (package-desc): Simplify (bug#15495).

=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el       2013-09-29 17:09:39 +0000
+++ b/lisp/term/ns-win.el       2013-10-01 18:22:48 +0000
@@ -912,12 +912,13 @@
   ;; 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:


reply via email to

[Prev in Thread] Current Thread [Next in Thread]