From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 26 Jan 2017 18:09:58 +0000 (+0100)
Subject: Fix the previous mml patch better
X-Git-Tag: emacs-26.0.90~870^2~41
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d47dadd1687e37e9d399a8b22edf11dd3f1c3f29;p=emacs.git

Fix the previous mml patch better

* lisp/gnus/mml.el (mml-minibuffer-read-file): Fix the
previous patch in a better way (bug#20480).
---

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 19c19decedd..a4a47f929f4 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1249,13 +1249,12 @@ If not set, `default-directory' will be used."
 
 (defun mml-minibuffer-read-file (prompt)
   (let* ((completion-ignored-extensions nil)
+	 (buffer-file-name nil)
 	 (file (read-file-name prompt
 			       (or mml-default-directory default-directory)
-			       "" t)))
+			       nil t)))
     ;; Prevent some common errors.  This is inspired by similar code in
     ;; VM.
-    (when (zerop (length file))
-      (error "No file name entered"))
     (when (file-directory-p file)
       (error "%s is a directory, cannot attach" file))
     (unless (file-exists-p file)