Commit bf3b936f authored by Dave Love's avatar Dave Love
Browse files

(mm-mime-mule-charset-alist)

(mm-find-mime-charset-region): Consider mule-utf-8.
parent be9e8331
2001-01-31 Dave Love <fx@gnu.org>
* mm-util.el (mm-mime-mule-charset-alist)
(mm-find-mime-charset-region): Consider mule-utf-8.
2001-01-31 Dave Love <fx@gnu.org> 2001-01-31 Dave Love <fx@gnu.org>
* gnus-art.el (gnus-article-x-face-command) * gnus-art.el (gnus-article-x-face-command)
......
;;; mm-util.el --- Utility functions for MIME things ;;; mm-util.el --- Utility functions for MIME things
;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. ;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; MORIOKA Tomohiko <morioka@jaist.ac.jp> ;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
(require 'mail-prsvr) (require 'mail-prsvr)
(defvar mm-mime-mule-charset-alist (defvar mm-mime-mule-charset-alist
'((us-ascii ascii) `((us-ascii ascii)
(iso-8859-1 latin-iso8859-1) (iso-8859-1 latin-iso8859-1)
(iso-8859-2 latin-iso8859-2) (iso-8859-2 latin-iso8859-2)
(iso-8859-3 latin-iso8859-3) (iso-8859-3 latin-iso8859-3)
...@@ -71,7 +71,11 @@ ...@@ -71,7 +71,11 @@
chinese-cns11643-3 chinese-cns11643-4 chinese-cns11643-3 chinese-cns11643-4
chinese-cns11643-5 chinese-cns11643-6 chinese-cns11643-5 chinese-cns11643-6
chinese-cns11643-7) chinese-cns11643-7)
(utf-8 unicode-a unicode-b unicode-c unicode-d unicode-e)) ,(if (or (charsetp 'unicode-a)
(not (coding-system-p 'mule-utf-8)))
'(utf-8 unicode-a unicode-b unicode-c unicode-d unicode-e)
;; If we have utf-8 we're in Mule 5+.
(delete 'ascii (coding-system-get 'mule-utf-8 'safe-charsets))))
"Alist of MIME-charset/MULE-charsets.") "Alist of MIME-charset/MULE-charsets.")
(eval-and-compile (eval-and-compile
...@@ -293,6 +297,7 @@ If the charset is `composition', return the actual one." ...@@ -293,6 +297,7 @@ If the charset is `composition', return the actual one."
(setq mail-parse-mule-charset (setq mail-parse-mule-charset
(or (car (last (assq mail-parse-charset (or (car (last (assq mail-parse-charset
mm-mime-mule-charset-alist))) mm-mime-mule-charset-alist)))
;; Fixme: don't fix that!
'latin-iso8859-1))) 'latin-iso8859-1)))
mail-parse-mule-charset))))))) mail-parse-mule-charset)))))))
...@@ -329,7 +334,8 @@ If the charset is `composition', return the actual one." ...@@ -329,7 +334,8 @@ If the charset is `composition', return the actual one."
(setq charsets (mm-delete-duplicates charsets)) (setq charsets (mm-delete-duplicates charsets))
(if (and (> (length charsets) 1) (if (and (> (length charsets) 1)
(fboundp 'find-coding-systems-region) (fboundp 'find-coding-systems-region)
(memq 'utf-8 (find-coding-systems-region b e))) (let ((cs (find-coding-systems-region b e)))
(or (memq 'utf-8 cs) (memq 'mule-utf-8 cs))))
'(utf-8) '(utf-8)
charsets))) charsets)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment