[Emacs-diffs] /srv/bzr/emacs/trunk r111625: lisp/gnus/mm-decode.el (mm-save-part): Handle invalid read-file-name results

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 111625
author: Christopher Schmidt <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2013-01-30 09:44:46 +0000
message:
  lisp/gnus/mm-decode.el (mm-save-part): Handle invalid read-file-name results
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-decode.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-01-21 22:07:34 +0000
+++ b/lisp/gnus/ChangeLog       2013-01-30 09:44:46 +0000
@@ -1,3 +1,7 @@
+2013-01-30  Christopher Schmidt  <address@hidden>
+
+       * mm-decode.el (mm-save-part): Handle invalid read-file-name results.
+
 2013-01-21  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus-sum.el (gnus-summary-read-group-1): Protect against not being

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2013-01-01 09:11:05 +0000
+++ b/lisp/gnus/mm-decode.el    2013-01-30 09:44:46 +0000
@@ -1298,14 +1298,26 @@
     (when filename
       (setq filename (gnus-map-function mm-file-name-rewrite-functions
                                        (file-name-nondirectory filename))))
-    (setq file
-          (read-file-name
-          (or prompt
-              (format "Save MIME part to (default %s): "
-                      (or filename "")))
-          (or mm-default-directory default-directory)
-          (expand-file-name (or filename "")
-                            (or mm-default-directory default-directory))))
+    (while
+       (progn
+         (setq file
+               (read-file-name
+                (or prompt
+                    (format "Save MIME part to (default %s): "
+                            (or filename "")))
+                (or mm-default-directory default-directory)
+                (expand-file-name (or filename "")
+                                  (or mm-default-directory 
default-directory))))
+         (cond ((or (not file) (equal file ""))
+                (message "Please enter a file name")
+                t)
+               ((and (file-directory-p file)
+                     (not filename))
+                (message "Please enter a non-directory file name")
+                t)
+               (t nil)))
+      (sit-for 2)
+      (discard-input))
     (if (file-directory-p file)
        (setq file (expand-file-name filename file))
       (setq file (expand-file-name