procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Synch with Gnus trunk.

Browse source 
(gnus-article-browse-delete-temp-files): Don't make query
 for each temp file when gnus-article-browse-delete-temp is ask.
This commit is contained in:
Katsumi Yamaoka 2010-06-02 00:10:42 +00:00
parent 24f574a964
commit 3aeb940248
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/gnus/ChangeLog
View file

@ -1,3 +1,8 @@
2010-06-02 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-article-browse-delete-temp-files): Don't make query
for each temp file when gnus-article-browse-delete-temp is ask.
2010-05-20 Kevin Ryde <user42@zip.com.au>
* gnus-start.el (gnus-level-unsubscribed): Doc fix. (Bug#6206)

36
lisp/gnus/gnus-art.el
View file

@ -2806,22 +2806,28 @@ summary buffer."
(defun gnus-article-browse-delete-temp-files (&optional how)
"Delete temp-files created by `gnus-article-browse-html-parts'."
(when (and gnus-article-browse-html-temp-list
(or how
(setq how gnus-article-browse-delete-temp)))
(when (and (eq how 'ask)
(gnus-y-or-n-p (format
"Delete all %s temporary HTML file(s)? "
(length gnus-article-browse-html-temp-list)))
(setq how t)))
(progn
(or how (setq how gnus-article-browse-delete-temp))
(if (eq how 'ask)
(let ((files (length gnus-article-browse-html-temp-list)))
(gnus-y-or-n-p (format
"Delete all %s temporary HTML file%s? "
files
(if (> files 1) "s" ""))))
how)))
(dolist (file gnus-article-browse-html-temp-list)
(when (and (file-exists-p file)
(or (eq how t)
;; `how' is neither `nil', `ask' nor `t' (i.e. `file'):
(gnus-y-or-n-p
(format "Delete temporary HTML file `%s'? " file))))
(if (file-directory-p file)
(gnus-delete-directory file)
(delete-file file))))
(cond ((file-directory-p file)
(when (or (not (eq how 'file))
(gnus-y-or-n-p
(format
"Delete temporary HTML file(s) in directory `%s'? "
(file-name-as-directory file))))
(gnus-delete-directory file)))
((file-exists-p file)
(when (or (not (eq how 'file))
(gnus-y-or-n-p
(format "Delete temporary HTML file `%s'? " file)))
(delete-file file)))))
;; Also remove file from the list when not deleted or if file doesn't
;; exist anymore.
(setq gnus-article-browse-html-temp-list nil))