# HG changeset patch # User Miles Bader # Date 1104336109 0 # Node ID 6b0648eec44c763d1da2abe596b248b808f87b71 # Parent b38b4451693d7d3fd40225b64c5004cae1b43362 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 * 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 . diff -r b38b4451693d -r 6b0648eec44c lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Wed Dec 29 10:06:44 2004 +0000 +++ b/lisp/gnus/ChangeLog Wed Dec 29 16:01:49 2004 +0000 @@ -1,3 +1,10 @@ +2004-12-27 Simon Josefsson + + * 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 + . + 2004-12-17 Kim F. Storm * gnus-group.el (gnus-group-mode-map): Map follow-link to mouse-face. diff -r b38b4451693d -r 6b0648eec44c lisp/gnus/mm-bodies.el --- a/lisp/gnus/mm-bodies.el Wed Dec 29 10:06:44 2004 +0000 +++ b/lisp/gnus/mm-bodies.el Wed Dec 29 16:01:49 2004 +0000 @@ -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 @@ -139,7 +139,8 @@ (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)