Mercurial > emacs
diff lisp/international/mule-cmds.el @ 90105:7e3f621f1dd4
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-15
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-95
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96
Move Gnus images into etc/images
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-97
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-105
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-14
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-15
Update from CVS: lisp/imap.el (imap-log): Doc fix.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-16
Merge from emacs--cvs-trunk--0
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 18 Feb 2005 00:41:50 +0000 |
| parents | a01e7a9f1659 04686828d0da |
| children | 30ad2795fdab |
line wrap: on
line diff
--- a/lisp/international/mule-cmds.el Mon Feb 14 03:40:07 2005 +0000 +++ b/lisp/international/mule-cmds.el Fri Feb 18 00:41:50 2005 +0000 @@ -2404,13 +2404,13 @@ (message "Warning: Default coding system `%s' disagrees with system codeset `%s' for this locale." coding-system codeset)))))))) - ;; On Windows, override locale-coding-system, keyboard-coding-system, - ;; selection-coding-system with system codepage. + ;; On Windows, override locale-coding-system, + ;; keyboard-coding-system with system codepage. Note: + ;; selection-coding-system is already set in w32select.c. (when (boundp 'w32-ansi-code-page) (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page)))) (when (coding-system-p code-page-coding) (setq locale-coding-system code-page-coding) - (set-selection-coding-system code-page-coding) (set-keyboard-coding-system code-page-coding) (set-terminal-coding-system code-page-coding))))