(vietnamese-viqr): Add charset-origin-alist property.

("Vietnamese"): Remove charset-origin-alist property.

diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index ca38e0a131d3c899337521104efd98e224130f0e..4c785872b6a8bd57cf0f4873aa8f70a54f072540 100644 (file)
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -225,7 +225,11 @@ Both tables are indexed by the position code of Vietnamese characters.")
  nil
  '((safe-charsets ascii vietnamese-viscii-lower vietnamese-viscii-upper)
    (post-read-conversion . viqr-post-read-conversion)
-   (pre-write-conversion . viqr-pre-write-conversion)))
+   (pre-write-conversion . viqr-pre-write-conversion)
+   (charset-origin-alist
+    (vietnamese-viscii-lower "VISCII" viet-encode-viscii-char)
+    (vietnamese-viscii-upper "VISCII" viet-encode-viscii-char))))
+
 
 (define-coding-system-alias 'viqr 'vietnamese-viqr)
 
@@ -243,9 +247,6 @@ Both tables are indexed by the position code of Vietnamese characters.")
  "Vietnamese" `((charset vietnamese-viscii-lower vietnamese-viscii-upper)
                (nonascii-translation
                 . ,viet-viscii-nonascii-translation-table)
-               (charset-origin-alist
-                (vietnamese-viscii-lower "VISCII" viet-encode-viscii-char)
-                (vietnamese-viscii-upper "VISCII" viet-encode-viscii-char))
                (coding-system vietnamese-viscii vietnamese-vscii
                               vietnamese-viqr)
                (coding-priority vietnamese-viscii)