X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/db0406bb64f7e5dceeb257c7e350f1e80ed9c1c1..0e963201d03d9229bb8ac4323291d2b0119526ed:/lisp/mail/mail-utils.el

diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index 2e6f06a675..b65171903c 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -1,8 +1,8 @@
 ;;; mail-utils.el --- utility functions used both by rmail and rnews
 
-;; Copyright (C) 1985, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2016 Free Software Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail, news
 
 ;; This file is part of GNU Emacs.
@@ -50,9 +50,10 @@ also the To field, unless this would leave an empty To field."
 ;;;###autoload
 (defun mail-file-babyl-p (file)
   "Return non-nil if FILE is a Babyl file."
-  (with-temp-buffer
-    (insert-file-contents file nil 0 100)
-    (looking-at "BABYL OPTIONS:")))
+  (let ((epa-inhibit t))
+    (with-temp-buffer
+      (insert-file-contents file nil 0 100)
+      (looking-at "BABYL OPTIONS:"))))
 
 (defun mail-string-delete (string start end)
   "Returns a string containing all of STRING except the part
@@ -63,12 +64,16 @@ from START (inclusive) to END (exclusive)."
 
 ;;;###autoload
 (defun mail-quote-printable (string &optional wrapper)
-  "Convert a string to the \"quoted printable\" Q encoding.
+  "Convert a string to the \"quoted printable\" Q encoding if necessary.
+If the string contains only ASCII characters and no troublesome ones,
+we return it unconverted.
+
 If the optional argument WRAPPER is non-nil,
 we add the wrapper characters =?ISO-8859-1?Q?....?=."
   (let ((i 0) (result ""))
     (save-match-data
-      (while (string-match "[?=\"\200-\377]" string i)
+      (while (or (string-match "[?=\"]" string i)
+		 (string-match "[^\000-\177]" string i))
 	(setq result
 	      (concat result (substring string i (match-beginning 0))
 		      (upcase (format "=%02x"
@@ -179,17 +184,15 @@ as Rmail does."
 		   (error "Malformed MIME quoted-printable message"))))
 	  (not failed))))))
 
-(eval-when-compile (require 'rfc822))
+(autoload 'rfc822-addresses "rfc822")
 
 (defun mail-strip-quoted-names (address)
   "Delete comments and quoted strings in an address list ADDRESS.
 Also delete leading/trailing whitespace and replace FOO <BAR> with just BAR.
 Return a modified address list."
-  (if (null address)
-      nil
+  (when address
     (if mail-use-rfc822
-	(progn (require 'rfc822)
-	       (mapconcat 'identity (rfc822-addresses address) ", "))
+	(mapconcat 'identity (rfc822-addresses address) ", ")
       (let (pos)
 
         ;; Strip comments.