X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-util.el;h=dfad2a2ad7a502c14f83cfa56d9b0dcf777cb6f9;hb=cddb4672a1b8d0b3fb03dd1c5cad4b01f9fab219;hp=aa22040b59ad1188ace600226624e8870fcc51e5;hpb=971df04821a4488e54ff9905a00b3be19f18787e;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index aa22040..dfad2a2 100644
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -26,20 +26,20 @@
 
 (defvar mm-running-xemacs (string-match "XEmacs" emacs-version))
 
-(defvar mm-running-ntemacs 
-  (and (not mm-running-xemacs) 
+(defvar mm-running-ntemacs
+  (and (not mm-running-xemacs)
        (string-match "nt" system-configuration)))
 
-(defvar mm-binary-coding-system 
+(defvar mm-binary-coding-system
   (if mm-running-xemacs
       'binary 'no-conversion)
-  "100% binary coding system.")   
+  "100% binary coding system.")
 
-(defvar mm-text-coding-system 
-  (cond 
+(defvar mm-text-coding-system
+  (cond
    ((not (fboundp 'coding-system-p)) nil)
    (mm-running-xemacs  ;; XEmacs
-    (and (coding-system-p 'no-conversion) 'no-conversion))
+    'no-conversion)
    (mm-running-ntemacs ;; NTEmacs
     (and (coding-system-p 'raw-text-dos) 'raw-text-dos))
    ((coding-system-p 'raw-text) 'raw-text) ;; Emacs
@@ -58,16 +58,21 @@
     (iso-8859-7 greek-iso8859-7)
     (iso-8859-8 hebrew-iso8859-8)
     (iso-8859-9 latin-iso8859-9)
+    (viscii vietnamese-viscii-lower)
     (iso-2022-jp-2 japanese-jisx0208)
     (iso-2022-jp latin-jisx0201
 		 japanese-jisx0208-1978)
     (euc-kr korean-ksc5601)
     (cn-gb-2312 chinese-gb2312)
     (cn-big5 chinese-big5-1 chinese-big5-2)
+    (tibetan tibetan)
+    (thai-tis620 thai-tis620)
+    (iso-2022-7bit ethiopic arabic-1-column arabic-2-column)
     (iso-2022-jp-2 latin-iso8859-1 greek-iso8859-7
 		   latin-jisx0201 japanese-jisx0208-1978
 		   chinese-gb2312 japanese-jisx0208
-		   korean-ksc5601 japanese-jisx0212)
+		   korean-ksc5601 japanese-jisx0212
+		   katakana-jisx0201)
     (iso-2022-int-1 latin-iso8859-1 greek-iso8859-7
 		    latin-jisx0201 japanese-jisx0208-1978
 		    chinese-gb2312 japanese-jisx0208
@@ -118,20 +123,11 @@
   (or mm-coding-system-list
       (setq mm-coding-system-list (mm-coding-system-list))))
 
-(defvar mm-charset-coding-system-alist
-  (let ((rest
-	 '((gb2312 . cn-gb-2312)
-	   (iso-2022-jp-2 . iso-2022-7bit-ss2)
-	   (x-ctext . ctext)))
-	(systems (mm-get-coding-system-list))
-	dest)
-    (while rest
-      (let ((pair (car rest)))
-	(unless (memq (car pair) systems)
-	  (setq dest (cons pair dest))))
-      (setq rest (cdr rest)))
-    dest)
-  "Charset/coding system alist.")
+(defvar mm-charset-synonym-alist
+  '((big5 . cn-big5)
+    (gb2312 . cn-gb-2312)
+    (x-ctext . ctext))
+  "A mapping from invalid charset names to the real charset names.")
 
 ;;; Internal variables:
 
@@ -156,7 +152,7 @@ used as the line break code type of the coding system."
   (when (stringp charset)
     (setq charset (intern (downcase charset))))
   (setq charset
-	(or (cdr (assq charset mm-charset-coding-system-alist))
+	(or (cdr (assq charset mm-charset-synonym-alist))
 	    charset))
   (when lbt
     (setq charset (intern (format "%s-%s" charset lbt))))
@@ -197,16 +193,30 @@ used as the line break code type of the coding system."
   (when (fboundp 'set-buffer-multibyte)
     (set-buffer-multibyte nil)))
 
-(defun mm-mime-charset (charset b e)
+(defun mm-mime-charset (charset)
+  "Return the MIME charset corresponding to the MULE CHARSET."
   (if (fboundp 'coding-system-get)
+      ;; This exists in Emacs 20.
       (or
-       (coding-system-get
-	(get-charset-property charset 'prefered-coding-system)
-	'mime-charset)
-       (car (memq charset (find-coding-systems-region
-			   (point-min) (point-max)))))
+       (and (get-charset-property charset 'prefered-coding-system)
+	    (coding-system-get
+	     (get-charset-property charset 'prefered-coding-system)
+	     'mime-charset))
+       (and (eq charset 'ascii)
+	    'us-ascii)
+       (get-charset-property charset 'prefered-coding-system)
+       (mm-mule-charset-to-mime-charset charset))
+    ;; This is for XEmacs.
     (mm-mule-charset-to-mime-charset charset)))
 
+(defun mm-find-mime-charset-region (b e)
+  "Return the MIME charsets needed to encode the region between B and E."
+  (let ((charsets
+	 (mapcar 'mm-mime-charset
+		 (delq 'ascii
+		       (mm-find-charset-region b e)))))
+    (delete-duplicates charsets)))
+
 (defsubst mm-multibyte-p ()
   "Say whether multibyte is enabled."
   (and (boundp 'enable-multibyte-characters)
@@ -242,8 +252,8 @@ See also `with-temp-file' and `with-output-to-string'."
   "Return a list of charsets in the region."
   (cond
    ((and (boundp 'enable-multibyte-characters)
-	 enable-multibyte-characters
-	 (fboundp 'find-charset-region))
+ 	 enable-multibyte-characters
+ 	 (fboundp 'find-charset-region))
     (find-charset-region b e))
    ((not (boundp 'current-language-environment))
     (save-excursion
@@ -253,8 +263,7 @@ See also `with-temp-file' and `with-output-to-string'."
 	(skip-chars-forward "\0-\177")
 	(if (eobp)
 	    '(ascii)
-	  ;;;!!!bogus
-	  (list 'ascii 'latin-iso8859-1)))))
+	  (delq nil (list 'ascii mail-parse-charset))))))
    (t
     ;; We are in a unibyte buffer, so we futz around a bit.
     (save-excursion
@@ -270,7 +279,12 @@ See also `with-temp-file' and `with-output-to-string'."
 
 (defun mm-read-charset (prompt)
   "Return a charset."
-  (completing-read prompt mm-mime-mule-charset-alist nil t))
+  (intern
+   (completing-read
+    prompt
+    (mapcar (lambda (e) (list (symbol-name (car e))))
+	    mm-mime-mule-charset-alist)
+    nil t)))
 
 (provide 'mm-util)