From: "William A. Perkins" <wa_perkins@pnl.gov>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Fo2PiWetj1"
Content-Transfer-Encoding: 7bit
Message-ID: <14561.12474.894563.571329@gehenna.pnl.gov>
Date: Tue, 28 Mar 2000 14:22:50 -0800 (PST)
To: johnh@ISI.EDU
Subject: Notes Mode, Mailcrypt and GPG
X-Mailer: VM 6.74 under Emacs 20.4.1
Reply-To: wa_perkins@pnl.gov


John,

I tried to use gpg with mailcrypt in notes-mode 1.18.  While getting
it to work I found a few typos in notes-mode.el.  A diff is attached.

Bill

-- 
Bill Perkins
Pacific Northwest National Laboratory
Environmental Technologies Division, Hydrology Group
P.O. Box 999 MSIN K9-36
Richland, Washington, USA  99352
voice: (509) 372-6131 fax: (509) 375-6740 email: wa_perkins@pnl.gov

--- notes-mode.el.orig	Tue Mar 28 13:21:27 2000
+++ notes-mode.el	Tue Mar 28 13:23:40 2000
@@ -414,7 +414,7 @@
     (car (mc-pgp50-lookup-key mc-pgp50-user-id)))
    ((eq notes-encryption-sub-library 'gpg)
     (car (mc-gpg-lookup-key mc-gpg-user-id)))
-   (t (error "notes-encryption-decrypt-region: no pgp sub-library."))))
+   (t (error "notes-encryption-mailcrypt-userid: no pgp sub-library."))))
 
 (defun notes-encryption-load-mailcrypt ()
   (require 'mailcrypt)
@@ -469,14 +469,14 @@
 	(mc-pgp50-encrypt-region recipients start end
 			       (notes-encryption-mailcrypt-userid) nil)
 	(setq mc-pgp50-comment old-comment))
-       ((eq notes-encryption-sub-library 'pgp)
+       ((eq notes-encryption-sub-library 'gpg)
 	(setq old-comment mc-gpg-comment)
-	(mc-pgp-encrypt-region recipients start end
+	(mc-gpg-encrypt-region recipients start end
 			       (notes-encryption-mailcrypt-userid) nil)
 	(setq mc-gpg-comment old-comment))
-       (t (error "notes-encryption-decrypt-region: no pgp sub-library.")))
+       (t (error "notes-encryption-encrypt-region: no pgp sub-library.")))
       (setq mc-pgp-always-sign old-sign)))
-   (t (error "notes-encryption-decrypt-region: no pgp library."))))
+   (t (error "notes-encryption-encrypt-region: no pgp library."))))
 
 (defun notes-encrypt-note (prefix)
   "Encrypt the current note for the current user.  With PREFIX, start from point."
