Commit 2f7717f6 authored by Miles Bader's avatar Miles Bader
Browse files

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>.
parent f4b483aa
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.
......
;;; 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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment