X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ew-dec.el;h=eebda02c92ab8e9b207705afe8ce7f8b150da2d7;hb=955b92b07f71c449e9ff8f2b49b7e12408527cec;hp=34f464af3b9d0a4f862ecff931f5017c998262ed;hpb=78a33e3e6fffbebddc10ade7a980201dad30acd8;p=elisp%2Fflim.git diff --git a/ew-dec.el b/ew-dec.el index 34f464a..eebda02 100644 --- a/ew-dec.el +++ b/ew-dec.el @@ -49,7 +49,7 @@ instead of its argument." (defun ew-decode-field-no-cache (field-name field-body &optional eword-filter) "No caching version of ew-decode-field." - (let ((tmp (assoc (downcase field-name) ew-decode-field-syntax-alist)) + (let ((tmp (assq (intern (downcase field-name)) ew-decode-field-syntax-alist)) frag-anchor frag1 frag2 decode) (if tmp (setq tmp (cdr tmp)) @@ -75,7 +75,7 @@ instead of its argument." (setq frag1 (get frag-anchor 'prev-frag) tmp ()) (while (not (eq frag1 frag-anchor)) - (setq tmp (cons (or (get frag1 'result) (symbol-name frag1)) tmp) + (setq tmp (cons (or (get frag1 'decoded) (symbol-name frag1)) tmp) frag1 (get frag1 'prev-frag))) (apply 'concat tmp))) @@ -94,7 +94,7 @@ instead of its argument." (defun ew-decode-none (anchor frag end eword-filter) (while (not (eq frag end)) - (put frag 'result (funcall ew-decode-us-ascii (symbol-name frag))) + (put frag 'decoded (funcall ew-decode-us-ascii (symbol-name frag))) (setq frag (get frag 'next-frag)))) (defun ew-decode-generic (anchor start end @@ -124,22 +124,22 @@ instead of its argument." (setq ewords (ew-rcons* ewords f) frag f)) (while (not (eq first frag)) - (put first 'result "") + (put first 'decoded "") (setq first (get first 'next-frag))) - (put frag 'result "") + (put frag 'decoded "") (setq result (ew-rappend result (funcall decode-ewords (nreverse ewords) eword-filter))))) ((memq type all) (setq buff (cons frag buff)) - (put frag 'result "")) + (put frag 'decoded "")) (t (error "unexpected token: %s (%s)" frag type))) (setq frag (get frag 'next-frag))) (when buff (setq result (ew-rappend result (funcall decode-others (nreverse buff))))) - (put start 'result + (put start 'decoded (apply 'ew-quote-concat (nreverse result))) ))