diff lisp/language/vietnamese.el @ 20739:5f2c7f919bbf

Adjusted for the change of make-coding-system. Register coding-priority key in language-info-alist.

--- a/lisp/language/vietnamese.el	Thu Jan 22 01:45:51 1998 +0000
+++ b/lisp/language/vietnamese.el	Thu Jan 22 01:46:28 1998 +0000
@@ -204,7 +204,8 @@
  'vietnamese-viscii 4 ?V
  "8-bit encoding for Vietnamese VISCII 1.1 (MIME:VISCII)"
  (cons ccl-decode-viscii ccl-encode-viscii)
- '(ascii vietnamese-viscii-lower vietnamese-viscii-upper))
+ '((safe-charsets ascii vietnamese-viscii-lower vietnamese-viscii-upper)
+   (mime-charset . viscii)))
 
 (define-coding-system-alias 'viscii 'vietnamese-viscii)
 
@@ -212,7 +213,7 @@
  'vietnamese-vscii 4 ?v
  "8-bit encoding for Vietnamese VSCII-1"
  (cons ccl-decode-vscii ccl-encode-vscii)
- '(ascii vietnamese-viscii-lower vietnamese-viscii-upper))
+ '((safe-charsets ascii vietnamese-viscii-lower vietnamese-viscii-upper)))
 
 (define-coding-system-alias 'vscii 'vietnamese-vscii)
 
@@ -220,11 +221,9 @@
  'vietnamese-viqr 0 ?q
  "Vietnamese latin transcription (VIQR)"
  nil
- '(ascii vietnamese-viscii-lower vietnamese-viscii-upper))
-(coding-system-put 'vietnamese-viqr 'post-read-conversion
-		   'viqr-post-read-conversion)
-(coding-system-put 'vietnamese-viqr 'pre-write-conversion
-		   'viqr-pre-write-conversion)
+ '((safe-charsets ascii vietnamese-viscii-lower vietnamese-viscii-upper)
+   (post-read-conversion . viqr-post-read-conversion)
+   (pre-write-conversion . viqr-pre-write-conversion)))
 
 (define-coding-system-alias 'viqr 'vietnamese-viqr)
 
@@ -236,14 +235,16 @@
 
 (set-language-info-alist
  "Vietnamese" '((setup-function . setup-vietnamese-environment)
-		(charset . (vietnamese-viscii-lower
-			    vietnamese-viscii-upper))
-		(coding-system . (vietnamese-viscii vietnamese-vscii
-				  vietnamese-viqr))
+		(charset vietnamese-viscii-lower vietnamese-viscii-upper)
+		(coding-system vietnamese-viscii vietnamese-vscii
+			       vietnamese-viqr)
+		(coding-priority vietnamese-viscii)
 		(sample-text . "Vietnamese (Ti,1*(Bng Vi,1.(Bt)	Ch,1`(Bo b,1U(Bn")
 		(documentation . "\
 For Vietnamese, Emacs uses special charasets internally.
-They can be decoded from and encoded to VISCC, VSCII, and VIQR.")
+They can be decoded from and encoded to VISCC, VSCII, and VIQR.
+Current setting put higher priority to the coding system VISCII than VSCII.
+If you prefer VSCII, please do: (prefer-coding-system 'vietnamese-vscii)")
 		))
 
 ;;; vietnamese.el ends here