From b7fb183e9e0b629b068da9f2cbb7f1b32817012a Mon Sep 17 00:00:00 2001 From: morioka Date: Fri, 21 May 1999 11:45:26 +0000 Subject: [PATCH] (ew-find-charset-rule): Renamed from `tm-eword::find-charset-rule'; use `find-mime-charset-by-charsets'. --- eword-encode.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eword-encode.el b/eword-encode.el index 1bca5cf..ef13509 100644 --- a/eword-encode.el +++ b/eword-encode.el @@ -184,18 +184,18 @@ MODE is allows `text', `comment', `phrase' or nil. Default value is (defmacro ew-rword-type (rword) (` (car (cdr (cdr (cdr (, rword))))))) -(defun tm-eword::find-charset-rule (charsets) +(defun ew-find-charset-rule (charsets) (if charsets - (let* ((charset (charsets-to-mime-charset charsets)) - (encoding (cdr (assq charset eword-charset-encoding-alist))) - ) + (let* ((charset (find-mime-charset-by-charsets charsets)) + (encoding (cdr (or (assq charset eword-charset-encoding-alist) + '(nil . "Q"))))) (list charset encoding) ))) (defun tm-eword::words-to-ruled-words (wl &optional mode) (mapcar (function (lambda (word) - (let ((ret (tm-eword::find-charset-rule (car word)))) + (let ((ret (ew-find-charset-rule (car word)))) (make-ew-rword (cdr word) (car ret)(nth 1 ret) mode) ))) wl)) @@ -399,7 +399,7 @@ MODE is allows `text', `comment', `phrase' or nil. Default value is (setq dest (append dest (list - (let ((ret (tm-eword::find-charset-rule + (let ((ret (ew-find-charset-rule (find-non-ascii-charset-string str)))) (make-ew-rword str (car ret)(nth 1 ret) 'phrase) -- 1.7.10.4