diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/gnus/gnus-start.el | 6 | ||||
| -rw-r--r-- | lisp/gnus/gnus-uu.el | 11 | ||||
| -rw-r--r-- | lisp/gnus/nnmail.el | 15 |
4 files changed, 21 insertions, 20 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index c46a639e1b9..99d85e8d2f5 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,12 @@ +1999-10-15 Stefan Monnier <monnier@cs.yale.edu> + + * gnus-start.el (gnus-slave-save-newsrc): + * gnus-uu.el (gnus-uu-tmp-dir, gnus-uu-decode-binhex) + (gnus-uu-decode-binhex-view, gnus-uu-digest-mail-forward) + (gnus-uu-initialize): + * nnmail.el (nnmail-make-complex-temp-name, nnmail-get-new-mail): + Use make-temp-file. + 1999-09-07 Eli Zaretskii <eliz@gnu.org> * nnsoup.el (nnsoup-tmp-directory): Use temporary-file-directory. diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 01c75bbf395..f4d8bc20103 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -2404,12 +2404,12 @@ If FORCE is non-nil, the .newsrc file is read." (save-excursion (set-buffer gnus-dribble-buffer) (let ((slave-name - (make-temp-name (concat gnus-current-startup-file "-slave-"))) + (make-temp-file (concat gnus-current-startup-file "-slave-"))) (modes (ignore-errors (file-modes (concat gnus-current-startup-file ".eld"))))) - (gnus-write-buffer slave-name) (when modes - (set-file-modes slave-name modes))))) + (set-file-modes slave-name modes)) + (gnus-write-buffer slave-name)))) (defun gnus-master-read-slave-newsrc () (let ((slave-files diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 2a976c3bb6b..ee1d32a5996 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el @@ -219,7 +219,7 @@ Note that this variable can be used in conjunction with the (defcustom gnus-uu-tmp-dir temporary-file-directory "*Variable saying where gnus-uu is to do its work. -Default is \"/tmp/\"." +Defaults to `temporary-file-directory'." :group 'gnus-extract :type 'directory) @@ -450,7 +450,7 @@ didn't work, and overwrite existing files. Otherwise, ask each time." gnus-uu-default-dir gnus-uu-default-dir)))) (setq gnus-uu-binhex-article-name - (make-temp-name (concat gnus-uu-work-dir "binhex"))) + (make-temp-file (concat gnus-uu-work-dir "binhex"))) (gnus-uu-decode-with-method 'gnus-uu-binhex-article n dir)) (defun gnus-uu-decode-uu-view (&optional n) @@ -503,7 +503,7 @@ didn't work, and overwrite existing files. Otherwise, ask each time." (read-file-name "Unbinhex, view and save in dir: " gnus-uu-default-dir gnus-uu-default-dir))) (setq gnus-uu-binhex-article-name - (make-temp-name (concat gnus-uu-work-dir "binhex"))) + (make-temp-file (concat gnus-uu-work-dir "binhex"))) (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic))) (gnus-uu-decode-binhex n file))) @@ -514,7 +514,7 @@ didn't work, and overwrite existing files. Otherwise, ask each time." "Digests and forwards all articles in this series." (interactive "P") (let ((gnus-uu-save-in-digest t) - (file (make-temp-name (nnheader-concat gnus-uu-tmp-dir "forward"))) + (file (make-temp-file (nnheader-concat gnus-uu-tmp-dir "forward"))) buf subject from) (gnus-setup-message 'forward (setq gnus-uu-digest-from-subject nil) @@ -1678,8 +1678,7 @@ didn't work, and overwrite existing files. Otherwise, ask each time." gnus-uu-tmp-dir))) (setq gnus-uu-work-dir - (make-temp-name (concat gnus-uu-tmp-dir "gnus"))) - (gnus-make-directory gnus-uu-work-dir) + (make-temp-file (concat gnus-uu-tmp-dir "gnus") t)) (set-file-modes gnus-uu-work-dir 448) (setq gnus-uu-work-dir (file-name-as-directory gnus-uu-work-dir)) (push (cons gnus-newsgroup-name gnus-uu-work-dir) diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 4774f2fc3a8..5b67668cac5 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -1238,13 +1238,6 @@ Return the number of characters in the body." ;;; Utility functions -(defun nnmail-make-complex-temp-name (prefix) - (let ((newname (make-temp-name prefix)) - (newprefix prefix)) - (while (file-exists-p newname) - (setq newprefix (concat newprefix "x")) - (setq newname (make-temp-name newprefix))) - newname)) ;; Written by Per Abrahamsen <amanda@iesd.auc.dk>. @@ -1623,8 +1616,7 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." nnmail-crash-box (intern (format "%s-save-mail" method)) spool-func group (intern (format "%s-active-number" method))) ;; Check whether the inbox is to be moved to the special tmp dir. - (setq incoming - (nnmail-make-complex-temp-name + (let ((prefix (expand-file-name (if nnmail-tmp-directory (concat @@ -1632,8 +1624,9 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." (file-name-nondirectory (concat (file-name-as-directory temp) "Incoming"))) (concat (file-name-as-directory temp) "Incoming"))))) - (unless (file-exists-p (file-name-directory incoming)) - (make-directory (file-name-directory incoming) t)) + (unless (file-exists-p (file-name-directory prefix)) + (make-directory (file-name-directory prefix) t)) + (setq incoming (make-temp-file prefix))) (rename-file nnmail-crash-box incoming t) (push incoming incomings)))) ;; If we did indeed read any incoming spools, we save all info. |