Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 108-110)

   - Merge from emacs--devo--0
   - Clean up merge mistakes
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-321

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 60a7e6b1e8be54eb625719b271c2ae784a54a144..1eec8b26fdfa108b1cfb6f31685b1b1c84daf14b 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * rfc2231.el (rfc2231-parse-string): Allow `*'s in parameter values.
+
 2006-06-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * message.el (message-syntax-checks): Doc fix.

diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index a5827ecb70cb66d461ff91e78099c2ef081db122..284c95fc15171e9d4cd040287e71e13ca8edfca9 100644 (file)
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -176,14 +176,14 @@ must never cause a Lisp error."
                          (buffer-substring
                           (point)
                           (progn
-                            (forward-sexp)
-                            ;; We might not have reached at the end of
-                            ;; the value because of non-ascii chars,
-                            ;; so we should jump over them if any.
-                            (while (and (not (eobp))
-                                        (> (char-after) ?\177))
+                            ;; Jump over asterisk, non-ASCII
+                            ;; and non-boundary characters.
+                            (while (and c
+                                        (or (eq c ?*)
+                                            (> c ?\177)
+                                            (not (eq (char-syntax c) ? ))))
                               (forward-char 1)
-                              (forward-sexp))
+                              (setq c (char-after)))
                             (point)))))
                   (t
                    (error "Invalid header: %s" string)))