Mercurial > emacs

diff lisp/gnus/smime.el @ 60239:bbe4bd573f0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-128 Merge from gnus--rel--5.10 Patches applied: * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-28 - miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-30 Update from CVS 2005-02-24 Reiner Steib <Reiner.Steib@gmx.de> * lisp/gnus/nnheader.el (nnheader-find-file-noselect): Added doc string. * lisp/gnus/nnfolder.el (nnfolder-read-folder): Use RAWFILE for `nnheader-find-file-noselect' to avoid `large-file-warning-threshold'. * lisp/gnus/gnus-sum.el (gnus-summary-caesar-message): Apply `gnus-treat-article' after rotation. * lisp/gnus/gnus-group.el (gnus-group-clear-data): Mention process/prefix in doc string. 2005-02-22 Arne J,Ax(Brgensen <arne@arnested.dk> * lisp/gnus/smime.el (smime-sign-buffer): Signal an error if `smime-sign-region' fails. (smime-encrypt-buffer): Signal an error if `smime-encrypt-region' fails.
author Miles Bader <miles@gnu.org>
date Fri, 25 Feb 2005 01:52:09 +0000
parents aac0a33f5772
children 0d1a48b1ca68
line wrap: on
line diff
--- a/lisp/gnus/smime.el	Fri Feb 25 00:23:25 2005 +0000
+++ b/lisp/gnus/smime.el	Fri Feb 25 01:52:09 2005 +0000
@@ -332,16 +332,17 @@
 KEYFILE should contain a PEM encoded key and certificate."
   (interactive)
   (with-current-buffer (or buffer (current-buffer))
-    (smime-sign-region
-     (point-min) (point-max)
-     (if keyfile
-	 keyfile
-       (smime-get-key-with-certs-by-email
-	(completing-read
-	 (concat "Sign using which key? "
-		 (if smime-keys (concat "(default " (caar smime-keys) ") ")
-		   ""))
-	 smime-keys nil nil (car-safe (car-safe smime-keys))))))))
+    (unless (smime-sign-region
+	     (point-min) (point-max)
+	     (if keyfile
+		 keyfile
+	       (smime-get-key-with-certs-by-email
+		(completing-read
+		 (concat "Sign using which key? "
+			 (if smime-keys (concat "(default " (caar smime-keys) ") ")
+			   ""))
+		 smime-keys nil nil (car-safe (car-safe smime-keys))))))
+      (error "Signing failed"))))
 
 (defun smime-encrypt-buffer (&optional certfiles buffer)
   "S/MIME encrypt BUFFER for recipients specified in CERTFILES.
@@ -350,11 +351,12 @@
 nil."
   (interactive)
   (with-current-buffer (or buffer (current-buffer))
-    (smime-encrypt-region
-     (point-min) (point-max)
-     (or certfiles
-	 (list (read-file-name "Recipient's S/MIME certificate: "
-			       smime-certificate-directory nil))))))
+    (unless (smime-encrypt-region
+	     (point-min) (point-max)
+	     (or certfiles
+		 (list (read-file-name "Recipient's S/MIME certificate: "
+				       smime-certificate-directory nil))))
+      (error "Encryption failed"))))
 
 ;; Verify+decrypt region