diff options
| author | Miles Bader <miles@gnu.org> | 2006-06-21 02:13:50 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-06-21 02:13:50 +0000 |
| commit | a367620f732e42040629617ddde52b3406f407f0 (patch) | |
| tree | 3a402818b2cdb89910187e70dfc1fa46bfb28607 | |
| parent | 4e78977ec270450214a0d2adcaee124cb148f96e (diff) | |
| download | emacs-a367620f732e42040629617ddde52b3406f407f0.tar.gz | |
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
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/rfc2231.el | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 60a7e6b1e8b..1eec8b26fdf 100644 --- 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 a5827ecb70c..284c95fc151 100644 --- 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))) |