diff options
| author | Miles Bader <miles@gnu.org> | 2004-12-29 16:01:49 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-12-29 16:01:49 +0000 |
| commit | 0acc06ad33181839655005525d73805f4644ea1b (patch) | |
| tree | bf98b97ebaa0e162287a482839195279184cc220 | |
| parent | d3161086a83742799a633a1e758faec87b650af7 (diff) | |
| download | emacs-0acc06ad33181839655005525d73805f4644ea1b.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-754
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-81
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82
Update from CVS
2004-12-27 Simon Josefsson <jas@extundo.com>
* lisp/gnus/mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used
when mm-use-ultra-safe-encoding is enabled (e.g., for PGP/MIME)
and we have trailing white space. Reported by Werner Koch
<wk@gnupg.org>.
| -rw-r--r-- | lisp/gnus/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/gnus/mm-bodies.el | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index fd541fed5aa..46a1449ce79 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2004-12-27 Simon Josefsson <jas@extundo.com> + + * mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used + when mm-use-ultra-safe-encoding is enabled (e.g., for PGP/MIME) + and we have trailing white space. Reported by Werner Koch + <wk@gnupg.org>. + 2004-12-17 Kim F. Storm <storm@cua.dk> * gnus-group.el (gnus-group-mode-map): Map follow-link to mouse-face. diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el index b3148fe04ac..a1d67cf1f93 100644 --- a/lisp/gnus/mm-bodies.el +++ b/lisp/gnus/mm-bodies.el @@ -1,6 +1,6 @@ ;;; mm-bodies.el --- Functions for decoding MIME things -;; Copyright (C) 1998, 1999, 2000, 2001, 2003 +;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> @@ -139,7 +139,8 @@ If no encoding was done, nil is returned." (cond ((and (not longp) (not (and mm-use-ultra-safe-encoding - (save-excursion (re-search-forward "^From " nil t)))) + (or (save-excursion (re-search-forward " $" nil t)) + (save-excursion (re-search-forward "^From " nil t))))) (eq bits '7bit)) bits) ((and (not mm-use-ultra-safe-encoding) |