diff options
| author | Ken Raeburn <raeburn@raeburn.org> | 2015-11-01 01:42:21 -0400 |
|---|---|---|
| committer | Ken Raeburn <raeburn@raeburn.org> | 2015-11-01 01:42:21 -0400 |
| commit | 39372e1a1032521be74575bb06f95a3898fbae30 (patch) | |
| tree | 754bd242a23d2358ea116126fcb0a629947bd9ec /lisp/mail/mail-utils.el | |
| parent | 6a3121904d76e3b2f63007341d48c5c1af55de80 (diff) | |
| parent | e11aaee266da52937a3a031cb108fe13f68958c3 (diff) | |
| download | emacs-39372e1a1032521be74575bb06f95a3898fbae30.tar.gz | |
merge from trunk
Diffstat (limited to 'lisp/mail/mail-utils.el')
| -rw-r--r-- | lisp/mail/mail-utils.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el index 0129d270db1..3d5d7c96054 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-2013 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001-2015 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 |