2000-11-03 08:58:08 ShengHuo ZHU <zsh@cs.rochester.edu>

	* rfc2231.el (rfc2231-parse-string): Decode when there is no number.
	(rfc2231-decode-encoded-string): Typo "> X 1".
	(rfc2231-encode-string): Insert the name of charset.
	* mail-parse.el (mail-header-encode-parameter): Use RFC2231.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 682be2c..1738311 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-03 08:58:08  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * rfc2231.el (rfc2231-parse-string): Decode when there is no number.
+       (rfc2231-decode-encoded-string): Typo "> X 1".
+       (rfc2231-encode-string): Insert the name of charset.
+       * mail-parse.el (mail-header-encode-parameter): Use RFC2231.
+
 2000-11-02 23:35:50  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-decode.el (mm-save-part): Return the filename.

diff --git a/lisp/mail-parse.el b/lisp/mail-parse.el
index d0ce7da..1fb1647 100644 (file)
--- a/lisp/mail-parse.el
+++ b/lisp/mail-parse.el
@@ -46,7 +46,8 @@
 (defalias 'mail-header-parse-content-type 'rfc2231-parse-string)
 (defalias 'mail-header-parse-content-disposition 'rfc2231-parse-string)
 (defalias 'mail-content-type-get 'rfc2231-get-value)
-(defalias 'mail-header-encode-parameter 'rfc2045-encode-string)
+;(defalias 'mail-header-encode-parameter 'rfc2045-encode-string)
+(defalias 'mail-header-encode-parameter 'rfc2231-encode-string)
 
 (defalias 'mail-header-remove-comments 'ietf-drums-remove-comments)
 (defalias 'mail-header-remove-whitespace 'ietf-drums-remove-whitespace)

diff --git a/lisp/rfc2231.el b/lisp/rfc2231.el
index fd850ae..8e0c341 100644 (file)
--- a/lisp/rfc2231.el
+++ b/lisp/rfc2231.el
@@ -78,7 +78,9 @@ The list will be on the form
            (when (eq c ?*)
              (forward-char 1)
              (setq c (char-after))
-             (when (memq c ntoken)
+             (if (not (memq c ntoken))
+                 (setq encoded t
+                       number nil)
                (setq number
                      (string-to-number
                       (buffer-substring
@@ -139,7 +141,7 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
             (string-to-number (buffer-substring (point) (+ (point) 2)) 16)
           (delete-region (1- (point)) (+ (point) 2)))))
       ;; Encode using the charset, if any.
-      (when (and (< (length elems) 1)
+      (when (and (> (length elems) 1)
                 (not (equal (intern (car elems)) 'us-ascii)))
        (mm-decode-coding-region (point-min) (point-max)
                                 (intern (car elems))))
@@ -186,7 +188,7 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
                (delete-char 1))
            (forward-char 1)))
        (goto-char (point-min))
-       (insert (or charset "ascii") "''")
+       (insert (or (symbol-name charset) "ascii") "''")
        (goto-char (point-min))
        (if (not broken)
            (insert param "*=")