From: yamaoka <yamaoka>
Date: Wed, 29 Jun 2005 08:38:35 +0000 (+0000)
Subject: Synch to No Gnus 200506290837.
X-Git-Tag: t-gnus-6_17_4-quimby-~469
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cb9f6f5558efc61239e0cd221d6beff8d28254f1;p=elisp%2Fgnus.git-

Synch to No Gnus 200506290837.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 52282c0..f6fbed1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2005-06-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-nocem.el (gnus-nocem-verifyer): Default to pgg-verify.
+	(gnus-fill-real-hashtb): Use hash table instead of obarray.
+	(gnus-nocem-check-article): Fetch the Type header.
+	(gnus-nocem-message-wanted-p): Fix the way to examine types.
+	(gnus-nocem-verify-issuer): Use functionp instead of fboundp.
+	(gnus-nocem-enter-article): Use hash tables rather than obarrays;
+	make sure gnus-nocem-hashtb is initialized.
+	(gnus-nocem-alist-to-hashtb): Use hash table instead of obarray.
+	(gnus-nocem-unwanted-article-p): Ditto.
+
+	* pgg.el (pgg-verify): Return the verification result.
+
 2005-06-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-art.el (gnus-mime-copy-part): Check whether coding-system
diff --git a/lisp/gnus-nocem.el b/lisp/gnus-nocem.el
index bbaf550..27b6785 100644
--- a/lisp/gnus-nocem.el
+++ b/lisp/gnus-nocem.el
@@ -1,6 +1,6 @@
 ;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2004
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 
@@ -74,12 +74,16 @@ issuer registry."
   :group 'gnus-nocem
   :type 'integer)
 
-(defcustom gnus-nocem-verifyer 'mc-verify
+(defcustom gnus-nocem-verifyer (lambda ()
+				 (pgg-verify-region (point-min) (point-max)))
   "*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."
+One likely value is the function using `pgg-verify-region'.
+If the function in this variable isn't bound, the message will be used
+unconditionally."
   :group 'gnus-nocem
-  :type '(radio (function-item mc-verify)
+  :type '(radio (function (lambda ()
+			    (pgg-verify-region (point-min) (point-max))))
+		(function-item mc-verify)
 		(function :tag "other")))
 
 (defcustom gnus-nocem-liberal-fetch nil
@@ -129,11 +133,12 @@ valid issuer, which is much faster if you are selective about the issuers."
 
 (defun gnus-fill-real-hashtb ()
   "Fill up a hash table with the real-name mappings from the user's active file."
-  (setq gnus-nocem-real-group-hashtb (gnus-make-hashtable
-				      (length gnus-newsrc-alist)))
+  (if (hash-table-p gnus-nocem-real-group-hashtb)
+      (clrhash gnus-nocem-real-group-hashtb)
+    (setq gnus-nocem-real-group-hashtb (make-hash-table :test 'equal)))
   (mapcar (lambda (group)
 	    (setq group (gnus-group-real-name (car group)))
-	    (gnus-sethash group t gnus-nocem-real-group-hashtb))
+	    (puthash group t gnus-nocem-real-group-hashtb))
 	  gnus-newsrc-alist))
 
 (defun gnus-nocem-scan-groups ()
@@ -246,7 +251,7 @@ valid issuer, which is much faster if you are selective about the issuers."
 	;; We get the name of the issuer.
 	(narrow-to-region b e)
 	(setq issuer (mail-fetch-field "issuer")
-	      type (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,18 +272,20 @@ valid issuer, which is much faster if you are selective about the issuers."
       (while (setq condition (pop conditions))
 	(cond
 	 ((stringp condition)
-	  (setq wanted (string-match condition type)))
+	  (when (string-match condition type)
+	    (setq wanted t)))
 	 ((and (consp condition)
 	       (eq (car condition) 'not)
 	       (stringp (cadr condition)))
-	  (setq wanted (not (string-match (cadr condition) type))))
+	  (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 (fboundp gnus-nocem-verifyer)
+  (if (functionp gnus-nocem-verifyer)
       (ignore-errors
 	(funcall gnus-nocem-verifyer))
     ;; If we don't have Mailcrypt, then we use the message anyway.
@@ -297,31 +304,26 @@ valid issuer, which is much faster if you are selective about the issuers."
       (while (search-forward "\t" nil t)
 	(cond
 	 ((not (ignore-errors
-		 (setq group (let ((obarray gnus-nocem-real-group-hashtb))
-			       (read buf)))))
+		 (setq group (gnus-group-real-name (symbol-name (read buf))))
+		 (gethash group gnus-nocem-real-group-hashtb)))
 	  ;; An error.
 	  )
-	 ((not (symbolp group))
-	  ;; Ignore invalid entries.
-	  )
-	 ((not (boundp group))
-	  ;; Make sure all entries in the hashtb are bound.
-	  (set group nil))
 	 (t
-	  (when (gnus-gethash (gnus-group-real-name (symbol-name group))
-			      gnus-nocem-real-group-hashtb)
-	    ;; Valid group.
-	    (beginning-of-line)
-	    (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))
-	    (forward-line 1)
-	    (while (eq (char-after) ?\t)
-	      (forward-line 1))))))
+	  ;; Valid group.
+	  (beginning-of-line)
+	  (while (eq (char-after) ?\t)
+	    (forward-line -1))
+	  (setq id (buffer-substring (point) (1- (search-forward "\t"))))
+	  (unless (if (hash-table-p gnus-nocem-hashtb)
+		      (gethash id gnus-nocem-hashtb)
+		    (setq gnus-nocem-hashtb (make-hash-table :test 'equal))
+		    nil)
+	    ;; only store if not already present
+	    (puthash id t gnus-nocem-hashtb)
+	    (push id ncm))
+	  (forward-line 1)
+	  (while (eq (char-after) ?\t)
+	    (forward-line 1)))))
       (when ncm
 	(setq gnus-nocem-touched-alist t)
 	(push (cons (let ((time (current-time))) (setcdr (cdr time) nil) time)
@@ -359,7 +361,9 @@ valid issuer, which is much faster if you are selective about the issuers."
 	 (prev pprev)
 	 (expiry (days-to-time gnus-nocem-expiry-wait))
 	 entry)
-    (setq gnus-nocem-hashtb (gnus-make-hashtable (* (length alist) 51)))
+    (if (hash-table-p gnus-nocem-hashtb)
+	(clrhash gnus-nocem-hashtb)
+      (setq gnus-nocem-hashtb (make-hash-table :test 'equal)))
     (while (setq entry (car alist))
       (if (not (time-less-p (time-since (car entry)) expiry))
 	  ;; This entry has expired, so we remove it.
@@ -368,7 +372,7 @@ valid issuer, which is much faster if you are selective about the issuers."
 	;; This is ok, so we enter it into the hashtable.
 	(setq entry (cdr entry))
 	(while entry
-	  (gnus-sethash (car entry) t gnus-nocem-hashtb)
+	  (puthash (car entry) t gnus-nocem-hashtb)
 	  (setq entry (cdr entry))))
       (setq alist (cdr alist)))))
 
@@ -386,7 +390,7 @@ valid issuer, which is much faster if you are selective about the issuers."
 (defun gnus-nocem-unwanted-article-p (id)
   "Say whether article ID in the current group is wanted."
   (and gnus-nocem-hashtb
-       (gnus-gethash id gnus-nocem-hashtb)))
+       (gethash id gnus-nocem-hashtb)))
 
 (provide 'gnus-nocem)
 
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 37c128c..f9483ed 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus.texi (NoCeM): gnus-nocem-verifyer defaults to pgg-verify.
+
 2005-06-23  Juanma Barranquero  <lekktu@gmail.com>
 
 	* gnus.texi (MIME Commands, Fancy Mail Splitting, Agent Visuals)
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 725527d..bcc83a9 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -20881,27 +20881,25 @@ NoCeM メッセージを発行する人はたくさんいます。このリストでは、誰の言うこ
 
 @item gnus-nocem-verifyer
 @vindex gnus-nocem-verifyer
-@findex mc-verify
-これは NoCeM 発行者が誰であるかと言っているかを証明する関数でなくてはな
-りません。初期設定では @code{mc-verify} であり、これは Mailcrypt 関数で
-す。もしこれが非常に遅くて、あなたが証明結果を気にしない (これはたぶん危
-険です) のであれば、この変数を @code{nil} にすることができます。
-
-もし署名済みの NoCeM メッセージを証明済み、未署名のメッセージを未証
-明 (でもそれを使う) としたいのなら、以下のようにすることができます。
+@findex pgg-verify-region
+これは NoCeM 発行者が本人であることを検証する関数でなくてはなりません。
+初期設定では、以下に示す @code{pgg-verify-region} を使う関数で
+す (註: Gnus では @code{pgg-verify} がディフォルトです)。
 
 @lisp
-(setq gnus-nocem-verifyer 'my-gnus-mc-verify)
-
-(defun my-gnus-mc-verify ()
-  (not (eq 'forged
-           (ignore-errors
-             (if (mc-verify)
-                 t
-               'forged)))))
+(lambda ()
+  (pgg-verify-region (point-min) (point-max)))
 @end lisp
 
-まあ、これはたぶん危険でしょうけどね。
+これは検証に成功したら非-@code{nil} を返し、そうでなければ (NoCeM メッセー
+ジが署名されていない場合を含みます) @code{nil} を返します。もしこれが非
+常に遅くて、検証結果を気にしない (これはたぶん危険です) のであれば、この
+変数を @code{nil} にすることができます。
+
+以前、デフォルトは Mailcrypt の関数である @code{mc-verify} でした。まだ
+それを使うことができますが、PGP の公開鍵を GnuPG の鍵束に加えることを厭
+わなければ、GnuPG とともに動作するディフォルトの関数に変えることができま
+す。
 
 @item gnus-nocem-directory
 @vindex gnus-nocem-directory
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 51ca9bb..198a648 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -21757,27 +21757,25 @@ The specs are applied left-to-right.
 
 @item gnus-nocem-verifyer
 @vindex gnus-nocem-verifyer
-@findex mc-verify
+@findex pgg-verify-region
 This should be a function for verifying that the NoCeM issuer is who she
-says she is.  The default is @code{mc-verify}, which is a Mailcrypt
-function.  If this is too slow and you don't care for verification
-(which may be dangerous), you can set this variable to @code{nil}.
-
-If you want signed NoCeM messages to be verified and unsigned messages
-not to be verified (but used anyway), you could do something like:
+says she is.  The default is the function using @code{pgg-verify-region}
+shown below:
 
 @lisp
-(setq gnus-nocem-verifyer 'my-gnus-mc-verify)
-
-(defun my-gnus-mc-verify ()
-  (not (eq 'forged
-           (ignore-errors
-             (if (mc-verify)
-                 t
-               'forged)))))
+(lambda ()
+  (pgg-verify-region (point-min) (point-max)))
 @end lisp
 
-This might be dangerous, though.
+It returns non-@code{nil} if the verification is successful, otherwise
+(including the case the NoCeM message was not signed) returns
+@code{nil}.  If this is too slow and you don't care for verification
+(which may be dangerous), you can set this variable to @code{nil}.
+
+Formerly the default was @code{mc-verify}, which is a Mailcrypt
+function.  While you can still use it, you can change it into the
+default function running with GnuPG if you are willing to add the
+@acronym{PGP} public keys to GnuPG's keyring.
 
 @item gnus-nocem-directory
 @vindex gnus-nocem-directory