[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-nocem.el

[Miles Bader]

Index: emacs/lisp/gnus/gnus-nocem.el
diff -c emacs/lisp/gnus/gnus-nocem.el:1.11 emacs/lisp/gnus/gnus-nocem.el:1.12
*** emacs/lisp/gnus/gnus-nocem.el:1.11  Sat Sep  4 13:13:43 2004
--- emacs/lisp/gnus/gnus-nocem.el       Thu Jun 30 00:27:41 2005
***************
*** 1,6 ****
  ;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment
  
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2004
  ;;        Free Software Foundation, Inc.
  
  
--- 1,6 ----
  ;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment
  
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2004, 2005
  ;;        Free Software Foundation, Inc.
  
  
***************
*** 74,85 ****
    :group 'gnus-nocem
    :type 'integer)
  
! (defcustom 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."
    :group 'gnus-nocem
!   :type '(radio (function-item mc-verify)
                (function :tag "other")))
  
  (defcustom gnus-nocem-liberal-fetch nil
--- 74,86 ----
    :group 'gnus-nocem
    :type 'integer)
  
! (defcustom gnus-nocem-verifyer 'pgg-verify
    "*Function called to verify that the NoCeM message is valid.
! One likely value is `pgg-verify'.  If the function in this variable
  isn't bound, the message will be used unconditionally."
    :group 'gnus-nocem
!   :type '(radio (function-item pgg-verify)
!               (function-item mc-verify)
                (function :tag "other")))
  
  (defcustom gnus-nocem-liberal-fetch nil
***************
*** 246,252 ****
        ;; We get the name of the issuer.
        (narrow-to-region b e)
        (setq issuer (mail-fetch-field "issuer")
!             type (mail-fetch-field "issuer"))
        (widen)
        (if (not (gnus-nocem-message-wanted-p issuer type))
            (message "invalid NoCeM issuer: %s" issuer)
--- 247,253 ----
        ;; We get the name of the issuer.
        (narrow-to-region b e)
        (setq issuer (mail-fetch-field "issuer")
!             type (mail-fetch-field "type"))
        (widen)
        (if (not (gnus-nocem-message-wanted-p issuer type))
            (message "invalid NoCeM issuer: %s" issuer)
***************
*** 267,284 ****
        (while (setq condition (pop conditions))
        (cond
         ((stringp condition)
!         (setq wanted (string-match condition type)))
         ((and (consp condition)
               (eq (car condition) 'not)
               (stringp (cadr condition)))
!         (setq wanted (not (string-match (cadr condition) type))))
         (t
          (error "Invalid NoCeM condition: %S" condition))))
        wanted))))
  
  (defun gnus-nocem-verify-issuer (person)
    "Verify using PGP that the canceler is who she says she is."
!   (if (fboundp gnus-nocem-verifyer)
        (ignore-errors
        (funcall gnus-nocem-verifyer))
      ;; If we don't have Mailcrypt, then we use the message anyway.
--- 268,287 ----
        (while (setq condition (pop conditions))
        (cond
         ((stringp condition)
!         (when (string-match condition type)
!           (setq wanted t)))
         ((and (consp condition)
               (eq (car condition) 'not)
               (stringp (cadr condition)))
!         (when (string-match (cadr condition) type)
!           (setq wanted nil)))
         (t
          (error "Invalid NoCeM condition: %S" condition))))
        wanted))))
  
  (defun gnus-nocem-verify-issuer (person)
    "Verify using PGP that the canceler is who she says she is."
!   (if (functionp gnus-nocem-verifyer)
        (ignore-errors
        (funcall gnus-nocem-verifyer))
      ;; If we don't have Mailcrypt, then we use the message anyway.
***************
*** 315,321 ****
            (while (eq (char-after) ?\t)
              (forward-line -1))
            (setq id (buffer-substring (point) (1- (search-forward "\t"))))
!           (unless (gnus-gethash id gnus-nocem-hashtb)
              ;; only store if not already present
              (gnus-sethash id t gnus-nocem-hashtb)
              (push id ncm))
--- 318,327 ----
            (while (eq (char-after) ?\t)
              (forward-line -1))
            (setq id (buffer-substring (point) (1- (search-forward "\t"))))
!           (unless (if gnus-nocem-hashtb
!                       (gnus-gethash id gnus-nocem-hashtb)
!                     (setq gnus-nocem-hashtb (gnus-make-hashtable))
!                     nil)
              ;; only store if not already present
              (gnus-sethash id t gnus-nocem-hashtb)
              (push id ncm))