Give proper SAFE-CHARSET argument in each

call of make-coding-system.

7 files changed, 35 insertions, 16 deletions

diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index b97c3f26698..95a5efe5e0a 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -47,7 +47,8 @@
  'cyrillic-iso-8bit 2 ?5
  "ISO 2022 based 8-bit encoding for Cyrillic script (MIME:ISO-8859-5)"
  '((ascii t) (cyrillic-iso8859-5 t) nil nil
-   nil ascii-eol ascii-cntl nil nil nil nil))
+   nil ascii-eol ascii-cntl nil nil nil nil)
+ '(ascii cyrillic-iso8859-5))
 
 (define-coding-system-alias 'iso-8859-5 'cyrillic-iso-8bit)
 
@@ -112,7 +113,8 @@
  ;; So people who use koi8 for languages other than Russian
  ;; will have to forgive us.
  ?R "KOI8 8-bit encoding for Cyrillic (MIME: KOI8-R)"
- (cons ccl-decode-koi8 ccl-encode-koi8))
+ (cons ccl-decode-koi8 ccl-encode-koi8)
+ '(ascii cyrillic-iso8859-5))
 
 (define-coding-system-alias 'koi8-r 'cyrillic-koi8)
 (define-coding-system-alias 'koi8 'cyrillic-koi8)
@@ -190,7 +192,8 @@
 (make-coding-system
  'cyrillic-alternativnyj 4 ?A
  "ALTERNATIVNYJ 8-bit encoding for Cyrillic"
- (cons ccl-decode-alternativnyj ccl-encode-alternativnyj))
+ (cons ccl-decode-alternativnyj ccl-encode-alternativnyj)
+ '(ascii cyrillic-iso8859-5))
 
 (define-coding-system-alias 'alternativnyj 'cyrillic-alternativnyj)
 
diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index f481de76ca1..f26e0fe6487 100644
--- a/lisp/language/devanagari.el
+++ b/lisp/language/devanagari.el
@@ -34,7 +34,8 @@
  'in-is13194-devanagari 2 ?D
  "8-bit encoding for ASCII (MSB=0) and IS13194-Devanagari (MSB=1)"
  '((ascii t) (indian-is13194 t) nil nil
-   nil ascii-eol))
+   nil ascii-eol)
+ '(ascii indian-is13194))
 
 (define-coding-system-alias 'devanagari 'in-is13194-devanagari)
 
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 47289e6c43a..a3986f0c01b 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -67,7 +67,8 @@
  'iso-latin-1 2 ?1
  "ISO 2022 based 8-bit encoding (MIME:ISO-8859-1, Compound Text Encoding)"
  '((ascii t) (latin-iso8859-1 t) nil nil
-   nil ascii-eol ascii-cntl nil nil nil nil nil nil nil nil nil t))
+   nil ascii-eol ascii-cntl nil nil nil nil nil nil nil nil nil t)
+ '(ascii latin-iso8859-1))
 
 (define-coding-system-alias 'iso-8859-1 'iso-latin-1)
 (define-coding-system-alias 'latin-1 'iso-latin-1)
@@ -99,7 +100,8 @@ These languages are supported with the Latin-1 (ISO-8859-1) character set:
  'iso-latin-2 2 ?2
  "ISO 2022 based 8-bit encoding (MIME:ISO-8859-2)"
  '((ascii t) (latin-iso8859-2 t) nil nil
-   nil ascii-eol ascii-cntl nil nil nil nil))
+   nil ascii-eol ascii-cntl nil nil nil nil)
+ '(ascii latin-iso8859-2))
 
 (define-coding-system-alias 'iso-8859-2 'iso-latin-2)
 (define-coding-system-alias 'latin-2 'iso-latin-2)
@@ -128,7 +130,8 @@ These languages are supported with the Latin-2 (ISO-8859-2) character set:
  'iso-latin-3 2 ?3
  "ISO 2022 based 8-bit encoding (MIME:ISO-8859-3)"
  '((ascii t) (latin-iso8859-3 t) nil nil
-   nil ascii-eol ascii-cntl nil nil nil nil))
+   nil ascii-eol ascii-cntl nil nil nil nil)
+ '(ascii latin-iso8859-3))
 
 (define-coding-system-alias 'iso-8859-3 'iso-latin-3)
 (define-coding-system-alias 'latin-3 'iso-latin-3)
@@ -157,7 +160,8 @@ These languages are supported with the Latin-3 (ISO-8859-3) character set:
  'iso-latin-4 2 ?4
  "ISO 2022 based 8-bit encoding (MIME:ISO-8859-4)"
  '((ascii t) (latin-iso8859-4 t) nil nil
-   nil ascii-eol ascii-cntl nil nil nil nil))
+   nil ascii-eol ascii-cntl nil nil nil nil)
+ '(ascii latin-iso8859-4))
 
 (define-coding-system-alias 'iso-8859-4 'iso-latin-4)
 (define-coding-system-alias 'latin-4 'iso-latin-4)
@@ -186,7 +190,8 @@ These languages are supported with the Latin-4 (ISO-8859-4) character set:
  'iso-latin-5 2 ?9
  "ISO 2022 based 8-bit encoding (MIME:ISO-8859-9)"
  '((ascii t) (latin-iso8859-9 t) nil nil
-   nil ascii-eol ascii-cntl nil nil nil nil))
+   nil ascii-eol ascii-cntl nil nil nil nil)
+ '(ascii latin-iso8859-9))
 
 (define-coding-system-alias 'iso-8859-9 'iso-latin-5)
 (define-coding-system-alias 'latin-5 'iso-latin-5)
diff --git a/lisp/language/greek.el b/lisp/language/greek.el
index 35eae190d16..8a9694016dd 100644
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@ -32,7 +32,8 @@
  'greek-iso-8bit 2 ?7
  "ISO 2022 based 8-bit encoding for Greek (MIME:ISO-8859-7)"
  '((ascii t) (greek-iso8859-7 t) nil nil
-   nil ascii-eol ascii-cntl nil nil nil nil))
+   nil ascii-eol ascii-cntl nil nil nil nil)
+ '(ascii greek-iso8859-7))
 
 (define-coding-system-alias 'iso-8859-7 'greek-iso-8bit)
 
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index b2a87ff4644..71fd2115f62 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -32,7 +32,8 @@
  'hebrew-iso-8bit 2 ?8
  "ISO 2022 based 8-bit encoding for Hebrew (MIME:ISO-8859-8)"
  '((ascii t) (hebrew-iso8859-8 t) nil nil
-   nil ascii-eol ascii-cntl nil nil nil nil nil t))
+   nil ascii-eol ascii-cntl nil nil nil nil nil t)
+ '(ascii hebrew-iso8859-8))
 
 (define-coding-system-alias 'iso-8859-8 'hebrew-iso-8bit)
 
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index b8e587dd88e..c109d487994 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -34,13 +34,17 @@
  "ISO 2022 based 7bit encoding for Japanese (MIME:ISO-2022-JP)"
  '((ascii japanese-jisx0208-1978 japanese-jisx0208
           latin-jisx0201 japanese-jisx0212 katakana-jisx0201 t) nil nil nil
-   short ascii-eol ascii-cntl seven))
+   short ascii-eol ascii-cntl seven)
+ '(ascii japanese-jisx0208-1978 japanese-jisx0208 latin-jisx0201))
 
 (define-coding-system-alias 'junet 'iso-2022-jp)
 
 (make-coding-system
  'japanese-shift-jis 1 ?S
- "Shift-JIS 8-bit encoding for Japanese (MIME:SHIFT_JIS)")
+ "Shift-JIS 8-bit encoding for Japanese (MIME:SHIFT_JIS)"
+ nil
+ '(ascii japanese-jisx0208 japanese-jisx0208-1978
+         latin-jisx0201 katakana-jisx0201))
 
 (define-coding-system-alias 'shift_jis 'japanese-shift-jis)
 (define-coding-system-alias 'sjis 'japanese-shift-jis)
@@ -50,7 +54,8 @@
  "ISO 2022 based 7-bit encoding for Japanese JISX0208-1978 and JISX0201-Roman"
  '((ascii japanese-jisx0208-1978 japanese-jisx0208
           latin-jisx0201 japanese-jisx0212 katakana-jisx0201 t) nil nil nil
-   short ascii-eol ascii-cntl seven nil nil use-roman use-oldjis))
+   short ascii-eol ascii-cntl seven nil nil use-roman use-oldjis)
+ '(ascii japanese-jisx0208-1978 japanese-jisx0208 latin-jisx0201))
 
 (define-coding-system-alias 'iso-2022-jp-1978-irv 'japanese-iso-7bit-1978-irv)
 (define-coding-system-alias 'old-jis 'japanese-iso-7bit-1978-irv)
@@ -60,7 +65,9 @@
  "ISO 2022 based EUC encoding for Japanese (MIME:EUC-JP)"
  '((ascii latin-jisx0201) (japanese-jisx0208 japanese-jisx0208-1978)
    katakana-jisx0201 japanese-jisx0212
-   short ascii-eol ascii-cntl nil nil single-shift))
+   short ascii-eol ascii-cntl nil nil single-shift)
+ '(ascii latin-jisx0201 japanese-jisx0208 japanese-jisx0208-1978
+   katakana-jisx0201 japanese-jisx0212))
 
 (define-coding-system-alias 'euc-japan-1990 'japanese-iso-8bit)
 (define-coding-system-alias 'euc-japan 'japanese-iso-8bit)
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 2c9f93780d8..1b1767a561a 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -92,7 +92,8 @@
  'tibetan 2 ?Q
  "8-bit encoding for ASCII (MSB=0) and TIBETAN (MSB=1)"
  '((ascii t) (tibetan t) nil nil
-   nil ascii-eol))
+   nil ascii-eol)
+ '(ascii tibetan))
 
 (coding-system-put 'tibetan 'post-read-conversion
                    'tibetan-post-read-conversion)