From ae6ad4776efa82333e4c65977bceb19cc187c4c7 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 12 Feb 2016 16:30:55 +1100 Subject: [PATCH] Avoid using mm-make-temp-file * lisp/gnus/mail-source.el (mail-source-delete-crash-box): Ditto. * lisp/gnus/mm-decode.el (mm-display-external): Ditto. * lisp/gnus/mml-smime.el (mml-smime-openssl-encrypt): Ditto. --- lisp/gnus/mail-source.el | 2 +- lisp/gnus/mm-decode.el | 6 +++--- lisp/gnus/mml-smime.el | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 693061632e1..d360f5f71fe 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el @@ -639,7 +639,7 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile) (if (eq mail-source-delete-incoming t) (delete-file mail-source-crash-box) (let ((incoming - (mm-make-temp-file + (make-temp-file (expand-file-name mail-source-incoming-file-prefix mail-source-directory)))) diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index d6900149d91..c861b9a8a29 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -915,7 +915,7 @@ external if displayed external." ;; The function is a string to be executed. (mm-insert-part handle) (mm-add-meta-html-tag handle) - (let* ((dir (mm-make-temp-file + (let* ((dir (make-temp-file (expand-file-name "emm." mm-tmp-directory) 'dir)) (filename (or (mail-content-type-get @@ -945,8 +945,8 @@ external if displayed external." ;; `mailcap-mime-extensions'. (setq suffix (car (rassoc (mm-handle-media-type handle) mailcap-mime-extensions)))) - (setq file (mm-make-temp-file (expand-file-name "mm." dir) - nil suffix)))) + (setq file (make-temp-file (expand-file-name "mm." dir) + nil suffix)))) (let ((coding-system-for-write mm-binary-coding-system)) (write-region (point-min) (point-max) file nil 'nomesg)) ;; The file is deleted after the viewer exists. If the users edits diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index 02be62e6038..e7ee6e7c889 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -149,8 +149,7 @@ Whether the passphrase is cached at all is controlled by (if (not (and (not (file-exists-p tmp)) (get-buffer tmp))) (push tmp certfiles) - (setq file (mm-make-temp-file (expand-file-name "mml." - mm-tmp-directory))) + (setq file (make-temp-file (expand-file-name "mml." mm-tmp-directory))) (with-current-buffer tmp (write-region (point-min) (point-max) file)) (push file certfiles) -- 2.39.2