(codepage-setup): Don't define a codepage if it is already defined.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35a70e7f8e067d9d9aa41604380159229f8dea0e..f9d6ed979ae6f2bb0322c7ce4dbde8e46fd874f7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
 
+       * international/codepage.el (codepage-setup): Don't define a
+       codepage if it is already defined.
+
        * textmodes/po.el (po-find-charset): Search for the Charset=
        header even if we've read less than 4KB.
        <top-level>: Remove the setup for all known codepages: it seems

diff --git a/lisp/international/codepage.el b/lisp/international/codepage.el
index c0d5405af688a10852ea1db194358c3fa772b5cb..01bf5a2053280276f2f241239c523c65a18bf3ac 100644 (file)
--- a/lisp/international/codepage.el
+++ b/lisp/international/codepage.el
@@ -659,9 +659,12 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal."
         (candidates (cp-supported-codepages)))
      (list (completing-read "Setup DOS Codepage: (default 437) " candidates
                            nil t nil nil "437"))))
-  (let ((cp (format "cp%s" codepage)))
-    (cp-make-coding-systems-for-codepage
-     cp (cp-charset-for-codepage cp) (cp-offset-for-codepage cp))))
+  (let* ((cp (format "cp%s" codepage))
+        (cp-defined (intern-soft cp)))
+    (or (and cp-defined  ;; avoid defining if already defined
+            (coding-system-p cp-defined))
+       (cp-make-coding-systems-for-codepage
+        cp (cp-charset-for-codepage cp) (cp-offset-for-codepage cp)))))
 
 (provide 'codepage)