aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-12 16:30:55 +1100
committerLars Ingebrigtsen2016-02-12 16:30:55 +1100
commitae6ad4776efa82333e4c65977bceb19cc187c4c7 (patch)
tree735dc4ae030b6e2c18488077499bdd2911abc17c
parent050f14e22e21148fac24f6b663b082bfb99a2016 (diff)
downloademacs-ae6ad4776efa82333e4c65977bceb19cc187c4c7.tar.gz
emacs-ae6ad4776efa82333e4c65977bceb19cc187c4c7.zip
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.
-rw-r--r--lisp/gnus/mail-source.el2
-rw-r--r--lisp/gnus/mm-decode.el6
-rw-r--r--lisp/gnus/mml-smime.el3
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)
639 (if (eq mail-source-delete-incoming t) 639 (if (eq mail-source-delete-incoming t)
640 (delete-file mail-source-crash-box) 640 (delete-file mail-source-crash-box)
641 (let ((incoming 641 (let ((incoming
642 (mm-make-temp-file 642 (make-temp-file
643 (expand-file-name 643 (expand-file-name
644 mail-source-incoming-file-prefix 644 mail-source-incoming-file-prefix
645 mail-source-directory)))) 645 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."
915 ;; The function is a string to be executed. 915 ;; The function is a string to be executed.
916 (mm-insert-part handle) 916 (mm-insert-part handle)
917 (mm-add-meta-html-tag handle) 917 (mm-add-meta-html-tag handle)
918 (let* ((dir (mm-make-temp-file 918 (let* ((dir (make-temp-file
919 (expand-file-name "emm." mm-tmp-directory) 'dir)) 919 (expand-file-name "emm." mm-tmp-directory) 'dir))
920 (filename (or 920 (filename (or
921 (mail-content-type-get 921 (mail-content-type-get
@@ -945,8 +945,8 @@ external if displayed external."
945 ;; `mailcap-mime-extensions'. 945 ;; `mailcap-mime-extensions'.
946 (setq suffix (car (rassoc (mm-handle-media-type handle) 946 (setq suffix (car (rassoc (mm-handle-media-type handle)
947 mailcap-mime-extensions)))) 947 mailcap-mime-extensions))))
948 (setq file (mm-make-temp-file (expand-file-name "mm." dir) 948 (setq file (make-temp-file (expand-file-name "mm." dir)
949 nil suffix)))) 949 nil suffix))))
950 (let ((coding-system-for-write mm-binary-coding-system)) 950 (let ((coding-system-for-write mm-binary-coding-system))
951 (write-region (point-min) (point-max) file nil 'nomesg)) 951 (write-region (point-min) (point-max) file nil 'nomesg))
952 ;; The file is deleted after the viewer exists. If the users edits 952 ;; 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
149 (if (not (and (not (file-exists-p tmp)) 149 (if (not (and (not (file-exists-p tmp))
150 (get-buffer tmp))) 150 (get-buffer tmp)))
151 (push tmp certfiles) 151 (push tmp certfiles)
152 (setq file (mm-make-temp-file (expand-file-name "mml." 152 (setq file (make-temp-file (expand-file-name "mml." mm-tmp-directory)))
153 mm-tmp-directory)))
154 (with-current-buffer tmp 153 (with-current-buffer tmp
155 (write-region (point-min) (point-max) file)) 154 (write-region (point-min) (point-max) file))
156 (push file certfiles) 155 (push file certfiles)