X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmml-smime.el;h=2eec91961b77542b76229d5d5ce60452a1b50535;hb=9b741e050b400987d68ff761c6cc3276c932839c;hp=8c4c709ed949b3f28dc9b55bb67d7a145baab31d;hpb=ca736d959c96aaa979f46d458340582e43dc735b;p=elisp%2Fgnus.git-

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 8c4c709..2eec919 100644
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -32,7 +32,8 @@
   (when (null smime-keys)
     (customize-variable 'smime-keys)
     (error "No S/MIME keys configured, use customize to add your key"))
-  (smime-sign-buffer (cdr (assq 'keyfile cont))))
+  (smime-sign-buffer (cdr (assq 'keyfile cont)))
+  (goto-char (point-max)))
 
 (defun mml-smime-encrypt (cont)
   (let (certnames certfiles tmp file tmpfiles)
@@ -44,7 +45,8 @@
       (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)
@@ -56,7 +58,8 @@
 	  t)
       (while (setq tmp (pop tmpfiles))
 	(delete-file tmp))
-      nil)))
+      nil))
+  (goto-char (point-max)))
 
 (defun mml-smime-sign-query ()
   ;; query information (what certificate) from user when MML tag is
@@ -110,8 +113,9 @@
   ;; 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