From f730ae478680d75c087cbfaa5c5a75626536d5be Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 8 Apr 1999 11:55:45 +0000 Subject: [PATCH] * Fix typo - "ommit" -> "omit". --- ChangeLog | 11 +++++++---- mime-mc.el | 14 +++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1503943..e357fc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,17 @@ 1999-04-08 Katsumi Yamaoka - * mime-mc.el (mime-mc-pgp50-sign-region, mime-mc-gpg-sign-region): - Detect and cache the value of message integrity check algorithm - before signing if the value of `mime-mc-ommit-micalg' is nil. + * mime-mc.el (mime-mc-pgp-sign-region): Omit the micalg parameter + if the value of `mime-mc-omit-micalg' is non-nil. + (mime-mc-pgp50-sign-region, mime-mc-gpg-sign-region): Detect and + cache the value of message integrity check algorithm before signing + and use it for the micalg parameter if the value of + `mime-mc-omit-micalg' is nil. (mime-mc-gpg-process-region): Show boundary in `mc-gpg-debug-buffer'. (mime-mc-pgp-process-region, mime-mc-pgp50-process-region, mime-mc-gpg-process-region): Add doc string. (mime-mc-micalg-alist): New variable. - (mime-mc-ommit-micalg): New user option. + (mime-mc-omit-micalg): New user option. (TopLevel): Require `alist' and `std11'. * mime-pgp.el (TopLevel): Add comment that this module is based on diff --git a/mime-mc.el b/mime-mc.el index 95830e1..67a1158 100644 --- a/mime-mc.el +++ b/mime-mc.el @@ -54,8 +54,8 @@ :group 'mime :type 'file) -(defcustom mime-mc-ommit-micalg nil - "Non-nil value means to ommit the micalg parameter for multipart/signed. +(defcustom mime-mc-omit-micalg nil + "Non-nil value means to omit the micalg parameter for multipart/signed. See draft-yamamoto-openpgp-mime-00.txt (OpenPGP/MIME) for more information." :group 'mime :type 'boolean) @@ -332,7 +332,7 @@ Content-Transfer-Encoding: 7bit (setq boundary (concat "gpg-" (substring boundary (match-end 0)))) ) - (if (not (or mime-mc-ommit-micalg + (if (not (or mime-mc-omit-micalg (setq micalg (cdr (assoc (cdr key) mime-mc-micalg-alist))) )) @@ -364,7 +364,7 @@ Content-Transfer-Encoding: 7bit --[[multipart/signed; protocol=\"application/pgp-signature\"; boundary=\"%s\"%s][7bit]]\n" boundary - (if mime-mc-ommit-micalg + (if mime-mc-omit-micalg "" (concat "; micalg=pgp-" micalg) ) @@ -594,7 +594,7 @@ Content-Transfer-Encoding: 7bit (setq args (cons (format "+comment=\"%s\"" mc-pgp50-comment) args)) ) (if (and boundary - (not (or mime-mc-ommit-micalg + (not (or mime-mc-omit-micalg (setq micalg (cdr (assoc (cdr key) mime-mc-micalg-alist))) ))) @@ -622,7 +622,7 @@ Content-Transfer-Encoding: 7bit --[[multipart/signed; protocol=\"application/pgp-signature\"; boundary=\"%s\"%s][7bit]]\n" boundary - (if mime-mc-ommit-micalg + (if mime-mc-omit-micalg "" (concat "; micalg=pgp-" micalg) ) @@ -758,7 +758,7 @@ Content-Transfer-Encoding: 7bit --[[multipart/signed; protocol=\"application/pgp-signature\"; boundary=\"%s\"%s][7bit]]\n" boundary - (if mime-mc-ommit-micalg + (if mime-mc-omit-micalg "" "; micalg=pgp-md5" ) -- 1.7.10.4