mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-17 18:37:33 +00:00
Fix last change.
This commit is contained in:
parent
c89ac69862
commit
f53b2875f0
1 changed files with 43 additions and 43 deletions
|
|
@ -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)
|
||||
|
|
@ -118,6 +84,45 @@
|
|||
'safe-charsets))))))
|
||||
"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
|
||||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue