projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch with Oort Gnus.
[elisp/gnus.git-]
/
lisp
/
mml-smime.el
diff --git
a/lisp/mml-smime.el
b/lisp/mml-smime.el
index
ac87492
..
2eec919
100644
(file)
--- a/
lisp/mml-smime.el
+++ b/
lisp/mml-smime.el
@@
-45,7
+45,8
@@
(if (not (and (not (file-exists-p tmp))
(get-buffer tmp)))
(push tmp certfiles)
(if (not (and (not (file-exists-p tmp))
(get-buffer tmp)))
(push tmp certfiles)
- (setq file (make-temp-name mm-tmp-directory))
+ (setq file (mm-make-temp-file (expand-file-name "mml."
+ mm-tmp-directory)))
(with-current-buffer tmp
(write-region (point-min) (point-max) file))
(push file certfiles)
(with-current-buffer tmp
(write-region (point-min) (point-max) file))
(push file certfiles)
@@
-112,8
+113,9
@@
;; todo: try dns/ldap automatically first, before prompting user
(let (certs done)
(while (not done)
;; todo: try dns/ldap automatically first, before prompting user
(let (certs done)
(while (not done)
- (ecase (read (gnus-completing-read "dns" "Fetch certificate from"
- '(("dns") ("file")) nil t))
+ (ecase (read (gnus-completing-read-with-default
+ "dns" "Fetch certificate from"
+ '(("dns") ("file")) nil t))
(dns (setq certs (append certs
(mml-smime-get-dns-cert))))
(file (setq certs (append certs
(dns (setq certs (append certs
(mml-smime-get-dns-cert))))
(file (setq certs (append certs