Don't define the charset iso-8859-1 here, just setup its properties.

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 3cafb52ccddcb1777a94d0c4498db15e0ac06ae1..f1dbd6b100ae1741a0ba756e273f14712eee3cce 100644 (file)
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -76,6 +76,12 @@
  'ascii :short-name "ASCII")
 (put-charset-property
  'ascii :long-name "ASCII (ISO646 IRV)")
+(put-charset-property
+ 'iso-8859-1 :docstring "Latin-1 (ISO/IEC 8859-1)")
+(put-charset-property
+ 'iso-8859-1 :short-name "Latin-1")
+(put-charset-property
+ 'iso-8859-1 :long-name "Latin-1")
 (put-charset-property
  'unicode :docstring "Unicode (ISO10646)")
 (put-charset-property
@@ -92,13 +98,6 @@
   :code-offset 0
   :supplementary-p t)
 
-(define-charset 'iso-8859-1
-  "Latin-1 (ISO/IEC 8859-1)"
-  :short-name "Latin-1"
-  :ascii-compatible-p t
-  :code-space [0 255]
-  :code-offset 0)
-
 (define-charset 'latin-iso8859-1
   "Right-Hand Part of ISO/IEC 8859/1 (Latin-1): ISO-IR-100"
   :short-name "RHP of Latin-1"