*** empty log message ***

[gnus] / lisp / gnus-nocem.el

diff --git a/lisp/gnus-nocem.el b/lisp/gnus-nocem.el
index 93c5911..ce78e1d 100644 (file)
--- a/lisp/gnus-nocem.el
+++ b/lisp/gnus-nocem.el
@@ -35,21 +35,23 @@
   "*List of groups that will be searched for NoCeM messages.")
 
 (defvar gnus-nocem-issuers 
-  '("Automoose-1" ; The CancelMoose[tm] on autopilot.
-    "clewis@ferret.ocunix.on.ca;" ; Chris Lewis -- Canadian angel & despammer.
-    "jem@xpat.com;"  ; John Milburn -- despammer in Korea.
-    "red@redpoll.mrfs.oh.us (Richard E. Depew)" ; Spew/bincancel guy.
-    )
+ '("AutoMoose-1" "Automoose-1"   ; CancelMoose[tm]
+   "rbraver@ohww.norman.ok.us"   ; Robert Braver
+   "clewis@ferret.ocunix.on.ca;" ; Chris Lewis
+   "jem@xpat.com;"              ; Despammer from Korea
+   "snowhare@xmission.com"       ; Benjamin "Snowhare" Franz
+   "red@redpoll.mrfs.oh.us (Richard E. Depew)"
+   )
   "*List of NoCeM issuers to pay attention to.")
 
 (defvar gnus-nocem-directory 
-  (concat (file-name-as-directory gnus-article-save-directory) "NoCeM/")
+  (nnheader-concat gnus-article-save-directory "NoCeM/")
   "*Directory where NoCeM files will be stored.")
 
 (defvar gnus-nocem-expiry-wait 15
   "*Number of days to keep NoCeM headers in the cache.")
 
-(defvar gnus-nocem-verifyer nil
+(defvar gnus-nocem-verifyer 'mc-verify
   "*Function called to verify that the NoCeM message is valid.
 One likely value is `mc-verify'.  If the function in this variable
 isn't bound, the message will be used unconditionally.")
@@ -139,19 +141,24 @@ isn't bound, the message will be used unconditionally.")
               (nnmail-days-to-time gnus-nocem-expiry-wait)))
       (gnus-request-article-this-buffer (mail-header-number header) group)
       (goto-char (point-min))
+      (when (re-search-forward "-----BEGIN PGP MESSAGE-----" nil t)
+       (delete-region (point-min) (match-beginning 0)))
+      (when (re-search-forward "-----END PGP MESSAGE-----\n?" nil t)
+       (delete-region (match-end 0) (point-max)))
+      (goto-char (point-min))
       ;; The article has to have proper NoCeM headers.
       (when (and (setq b (search-forward "\n@@BEGIN NCM HEADERS\n" nil t))
                 (setq e (search-forward "\n@@BEGIN NCM BODY\n" nil t)))
        ;; We get the name of the issuer.
        (narrow-to-region b e)
        (setq issuer (mail-fetch-field "issuer"))
+       (widen)
        (and (member issuer gnus-nocem-issuers) ; We like her...
             (gnus-nocem-verify-issuer issuer) ; She is who she says she is..
             (gnus-nocem-enter-article)))))) ; We gobble the message.
   
 (defun gnus-nocem-verify-issuer (person)
   "Verify using PGP that the canceler is who she says she is."
-  (widen)
   (if (fboundp gnus-nocem-verifyer)
       (funcall gnus-nocem-verifyer)
     ;; If we don't have Mailcrypt, then we use the message anyway.