2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 465bf57612b..622c0c777e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-15  Benjamin Riefenstahl  <Benjamin.Riefenstahl@epost.de>
+
+        * international/mule-cmds.el (set-locale-environment): Remove call
+        to set-selection-coding-system on Windows.
+
 2005-02-15  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc-alg.el: Add simplification rules for calcFunc-sec,
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 2b3af4d7e50..2106585f8a7 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2421,13 +2421,13 @@ See also `locale-charset-language-names', `locale-language-names',
           (prefer-coding-system coding-system)
           (setq locale-coding-system coding-system))))
 
-    ;; 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))))