From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 Mar 2002 16:42:37 +0000 (+0000)
Subject: (codepage-setup): Don't define a codepage if it is already defined.
X-Git-Tag: ttn-vms-21-2-B4~16138
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7dd4fd43473fff089d69ac2ed17ede7077b2d90a;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35a70e7f8e0..f9d6ed979ae 100644
--- 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 c0d5405af68..01bf5a20532 100644
--- 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)