summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>2001-03-05 21:39:19 +0000
committerDave Love <fx@gnu.org>2001-03-05 21:39:19 +0000
commit1460d913a4fd1951960ec831d007499455153aac (patch)
treefc2af9742ef2b6d6d3cffa82dab425f5ee7b9117
parentc84a68e2fbc16ac7d0167033cbdd1860ce3d774a (diff)
downloademacs-1460d913a4fd1951960ec831d007499455153aac.tar.gz
Fix last change.
-rw-r--r--lisp/gnus/mm-util.el86
1 files changed, 43 insertions, 43 deletions
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 1f9e822cebe..529f568fcda 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -27,44 +27,10 @@
(eval-when-compile (require 'cl))
(require 'mail-prsvr)
-(eval-and-compile
- (mapcar
- (lambda (elem)
- (let ((nfunc (intern (format "mm-%s" (car elem)))))
- (if (fboundp (car elem))
- (defalias nfunc (car elem))
- (defalias nfunc (cdr elem)))))
- '((decode-coding-string . (lambda (s a) s))
- (encode-coding-string . (lambda (s a) s))
- (encode-coding-region . ignore)
- (coding-system-list . ignore)
- (decode-coding-region . ignore)
- (char-int . identity)
- (device-type . ignore)
- (coding-system-equal . equal)
- (annotationp . ignore)
- (set-buffer-file-coding-system . ignore)
- (make-char
- . (lambda (charset int)
- (int-to-char int)))
- (read-coding-system
- . (lambda (prompt)
- "Prompt the user for a coding system."
- (completing-read
- prompt (mapcar (lambda (s) (list (symbol-name (car s))))
- mm-mime-mule-charset-alist))))
- (read-charset
- . (lambda (prompt)
- "Return a charset."
- (intern
- (completing-read
- prompt
- (mapcar (lambda (e) (list (symbol-name (car e))))
- mm-mime-mule-charset-alist)
- nil t))))
- (string-as-unibyte . identity)
- (multibyte-string-p . ignore)
- )))
+(defun mm-coding-system-p (sym)
+ "Return non-nil if SYM is a coding system."
+ (or (and (fboundp 'coding-system-p) (coding-system-p sym))
+ (memq sym (mm-get-coding-system-list))))
(defvar mm-mime-mule-charset-alist
`((us-ascii ascii)
@@ -119,6 +85,45 @@
"Alist of MIME-charset/MULE-charsets.")
(eval-and-compile
+ (mapcar
+ (lambda (elem)
+ (let ((nfunc (intern (format "mm-%s" (car elem)))))
+ (if (fboundp (car elem))
+ (defalias nfunc (car elem))
+ (defalias nfunc (cdr elem)))))
+ '((decode-coding-string . (lambda (s a) s))
+ (encode-coding-string . (lambda (s a) s))
+ (encode-coding-region . ignore)
+ (coding-system-list . ignore)
+ (decode-coding-region . ignore)
+ (char-int . identity)
+ (device-type . ignore)
+ (coding-system-equal . equal)
+ (annotationp . ignore)
+ (set-buffer-file-coding-system . ignore)
+ (make-char
+ . (lambda (charset int)
+ (int-to-char int)))
+ (read-coding-system
+ . (lambda (prompt)
+ "Prompt the user for a coding system."
+ (completing-read
+ prompt (mapcar (lambda (s) (list (symbol-name (car s))))
+ mm-mime-mule-charset-alist))))
+ (read-charset
+ . (lambda (prompt)
+ "Return a charset."
+ (intern
+ (completing-read
+ prompt
+ (mapcar (lambda (e) (list (symbol-name (car e))))
+ mm-mime-mule-charset-alist)
+ nil t))))
+ (string-as-unibyte . identity)
+ (multibyte-string-p . ignore)
+ )))
+
+(eval-and-compile
(defalias 'mm-char-or-char-int-p
(cond
((fboundp 'char-or-char-int-p) 'char-or-char-int-p)
@@ -131,11 +136,6 @@
(or mm-coding-system-list
(setq mm-coding-system-list (mm-coding-system-list))))
-(defun mm-coding-system-p (sym)
- "Return non-nil if SYM is a coding system."
- (or (and (fboundp 'coding-system-p) (coding-system-p sym))
- (memq sym (mm-get-coding-system-list))))
-
(defvar mm-charset-synonym-alist
`((big5 . cn-big5)
(gb2312 . cn-gb-2312)