aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2007-11-14 10:26:09 +0000
committerJason Rumney2007-11-14 10:26:09 +0000
commit262452334c27b061364456d41f67c3868b14aa1c (patch)
treeca7838d1a2d66e3e387d121e55cf5828741938ec
parentd4b9f75c4299a22c4bb98069ee30c2d933749b96 (diff)
downloademacs-262452334c27b061364456d41f67c3868b14aa1c.tar.gz
emacs-262452334c27b061364456d41f67c3868b14aa1c.zip
(set-locale-environment): Set default-file-name-coding-system
from system defaults on Windows.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule-cmds.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32c1447ceab..cd82ad1f0c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-11-14 Jason Rumney <jasonr@gnu.org>
2
3 * international/mule-cmds.el (set-locale-environment): Set
4 default-file-name-coding-system from system defaults on Windows.
5
12007-11-14 Nick Roberts <nickrob@snap.net.nz> 62007-11-14 Nick Roberts <nickrob@snap.net.nz>
2 7
3 * progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable. 8 * progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index a858066f47c..bd2d03eb5d4 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2609,12 +2609,13 @@ See also `locale-charset-language-names', `locale-language-names',
2609 (setq locale-coding-system coding-system)))) 2609 (setq locale-coding-system coding-system))))
2610 2610
2611 ;; On Windows, override locale-coding-system, 2611 ;; On Windows, override locale-coding-system,
2612 ;; keyboard-coding-system with system codepage. Note: 2612 ;; default-file-name-coding-system, keyboard-coding-system,
2613 ;; selection-coding-system is already set in w32select.c. 2613 ;; terminal-coding-system with system codepage.
2614 (when (boundp 'w32-ansi-code-page) 2614 (when (boundp 'w32-ansi-code-page)
2615 (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page)))) 2615 (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page))))
2616 (when (coding-system-p code-page-coding) 2616 (when (coding-system-p code-page-coding)
2617 (setq locale-coding-system code-page-coding) 2617 (setq locale-coding-system code-page-coding)
2618 (setq default-file-name-coding-system code-page-coding)
2618 (set-keyboard-coding-system code-page-coding) 2619 (set-keyboard-coding-system code-page-coding)
2619 (set-terminal-coding-system code-page-coding)))) 2620 (set-terminal-coding-system code-page-coding))))
2620 2621