From c22360cdc9e20ffa3956293955e3d43ca15a29dc Mon Sep 17 00:00:00 2001 From: ShengHuo ZHU Date: Fri, 17 Aug 2001 21:54:06 +0000 Subject: [PATCH] 2001-08-17 14:00:00 ShengHuo ZHU * smime.el (smime-point-at-eol): eval-and-compile. (smime-make-temp-file): New. (smime-sign-region, smime-encrypt-region, smime-decrypt-region): Use it. --- lisp/ChangeLog | 7 +++++++ lisp/smime.el | 24 +++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cdb398fd1..e835ec486 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2001-08-17 14:00:00 ShengHuo ZHU + + * smime.el (smime-point-at-eol): eval-and-compile. + (smime-make-temp-file): New. + (smime-sign-region, smime-encrypt-region, smime-decrypt-region): + Use it. + 2001-08-17 10:41:14 Lars Magne Ingebrigtsen * gnus-agent.el (gnus-agent-fetch-group): Go online if offline. diff --git a/lisp/smime.el b/lisp/smime.el index b2a2a258e..eecfffbc9 100644 --- a/lisp/smime.el +++ b/lisp/smime.el @@ -189,6 +189,15 @@ If nil, use system defaults." (defvar smime-details-buffer "*OpenSSL output*") +(eval-and-compile + (defalias 'smime-make-temp-file + (if (fboundp 'make-temp-file) + 'make-temp-file + (lambda (prefix &optional dir-flag) ;; Simple implementation + (expand-file-name + (make-temp-name prefix) + temporary-file-directory))))) + ;; Password dialog function (defun smime-ask-passphrase () @@ -229,7 +238,7 @@ to include in its caar." (certfiles (and (cdr keyfiles) (cadr keyfiles))) (buffer (generate-new-buffer (generate-new-buffer-name " *smime*"))) (passphrase (smime-ask-passphrase)) - (tmpfile (make-temp-file "smime"))) + (tmpfile (smime-make-temp-file "smime"))) (if passphrase (setenv "GNUS_SMIME_PASSPHRASE" passphrase)) (prog1 @@ -263,7 +272,7 @@ have proper MIME tags. CERTFILES is a list of filenames, each file is expected to contain of a PEM encoded certificate." (smime-new-details-buffer) (let ((buffer (generate-new-buffer (generate-new-buffer-name " *smime*"))) - (tmpfile (make-temp-file "smime"))) + (tmpfile (smime-make-temp-file "smime"))) (prog1 (when (prog1 (apply 'smime-call-openssl-region b e (list buffer tmpfile) @@ -354,7 +363,7 @@ in the buffer specified by `smime-details-buffer'." (smime-new-details-buffer) (let ((buffer (generate-new-buffer (generate-new-buffer-name " *smime*"))) CAs (passphrase (smime-ask-passphrase)) - (tmpfile (make-temp-file "smime"))) + (tmpfile (smime-make-temp-file "smime"))) (if passphrase (setenv "GNUS_SMIME_PASSPHRASE" passphrase)) (if (prog1 @@ -461,10 +470,11 @@ A string or a list of strings is returned." (caddr curkey) (smime-get-certfiles keyfile otherkeys))))) -(defalias 'smime-point-at-eol - (if (fboundp 'point-at-eol) - 'point-at-eol - 'line-end-position)) +(eval-and-compile + (defalias 'smime-point-at-eol + (if (fboundp 'point-at-eol) + 'point-at-eol + 'line-end-position))) (defun smime-buffer-as-string-region (b e) "Return each line in region between B and E as a list of strings." -- 2.25.1