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>.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fd541fed5aa9b1678b5f2e179503b7decd8ec2b1..46a1449ce79349a05a19d85b789b11ecb1ee1baa 100644 (file)
--- 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 b3148fe04ac9c05f600c603b2e53eed2a3090454..a1d67cf1f934dd40b91f0061e81bf479013a4317 100644 (file)
--- 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)