lisp/gnus/mm-decode.el (mm-save-part): Handle invalid read-file-name results

This commit is contained in:
Christopher Schmidt 2013-01-30 09:44:46 +00:00 committed by Katsumi Yamaoka
parent 8bc8712edd
commit dc39b96aae
2 changed files with 24 additions and 8 deletions

View file

@ -1,3 +1,7 @@
2013-01-30 Christopher Schmidt <christopher@ch.ristopher.com>
* mm-decode.el (mm-save-part): Handle invalid read-file-name results.
2013-01-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-summary-read-group-1): Protect against not being

View file

@ -1298,14 +1298,26 @@ PROMPT overrides the default one used to ask user for a file name."
(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