From: yamaoka <yamaoka>
Date: Fri, 3 Jan 2003 07:22:45 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_10-00-quimby~7
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8b37e5f2831a48cf9d2237d17a6664179614fc03;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd83dfa..0232585 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-03  Teodor Zlatanov  <tzz@beld.net>
+
+	* spam.el (spam-enter-ham-BBDB, spam-BBDB-register-routine):
+	enable BBDB ham processing
+	(spam-blacklist-register-routine): enable blacklist spam processing
+	(spam-whitelist-register-routine): enable whitelist ham processing
+	(spam-fetch-field-from-fast): fast fetching of the "from" field
+	from (gnus-data-list)
+	(spam-summary-prepare-exit): works completely now
+
 2003-01-03  Jesper Harder  <harder@ifa.au.dk>
 
 	* mml.el (mml-insert-tag): Don't quote non-ASCII unibyte
diff --git a/lisp/spam.el b/lisp/spam.el
index 946135e..4b9f0ec 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -115,7 +115,7 @@ The regular expression is matched against the address."
   :type 'boolean
   :group 'spam)
 
-(defcustom spam-use-bbdb nil
+(defcustom spam-use-BBDB nil
   "Whether BBDB should be used by spam-split."
   :type 'boolean
   :group 'spam)
@@ -279,7 +279,6 @@ articles before they get registered by Bogofilter."
     (spam-mark-spam-as-expired-and-move-routine (gnus-parameter-spam-process-destination gnus-newsgroup-name)))
 
   (when (spam-group-ham-contents-p gnus-newsgroup-name)
-    ;; TODO: the ham processors here
     (when (or spam-use-whitelist
 	      (spam-group-processor-whitelist-p gnus-newsgroup-name))
       (spam-whitelist-register-routine))
@@ -330,18 +329,24 @@ articles before they get registered by Bogofilter."
 	    ((memq article gnus-newsgroup-saved))
 	    ((memq mark ham-mark-values) (push article ham-articles))))
     (when (and ham-articles ham-func)
-      (funcall ham-func ham-articles))
+      (mapc ham-func ham-articles))	; we use mapc because unlike mapcar it discards the return values
     (when (and spam-articles spam-func)
-      (funcall spam-func spam-articles))))
+      (mapc spam-func spam-articles))))	; we use mapc because unlike mapcar it discards the return values
+
+(defun spam-fetch-field-from-fast (article)
+  "Fetch the `from' field quickly, using the Gnus internal gnus-data-list function"
+  (if (and (numberp article)
+	   (assoc article (gnus-data-list nil)))
+      (mail-header-from (gnus-data-header (assoc article (gnus-data-list nil))))
+    nil))
 
 
 ;;;; Spam determination.
 
-
 (defvar spam-list-of-checks
   '((spam-use-blacklist  . spam-check-blacklist)
     (spam-use-whitelist  . spam-check-whitelist)
-    (spam-use-bbdb	 . spam-check-bbdb)
+    (spam-use-BBDB	 . spam-check-BBDB)
     (spam-use-ifile	 . spam-check-ifile)
     (spam-use-blackholes . spam-check-blackholes)
     (spam-use-bogofilter . spam-check-bogofilter))
@@ -408,6 +413,66 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
     (when matches
       spam-split-group)))
 
+;;;; BBDB
+;;; original idea for spam-check-BBDB from Alexander Kotelnikov <sacha@giotto.sj.ru>
+
+;; all this is done inside a condition-case to trap errors
+(condition-case nil
+    (progn
+
+      (require 'bbdb-com)
+
+      (defun spam-enter-ham-BBDB (from)
+	"Enter an address into the BBDB; implies ham (non-spam) sender"
+	(when (stringp from)
+	  (let* ((parsed-address (gnus-extract-address-components from))
+		 (name (or (car parsed-address) "Ham Sender"))
+		 (net-address (car (cdr parsed-address))))
+	    (message "Adding address %s to BBDB" from)
+	    (when (and net-address
+		       (not (bbdb-search (bbdb-records) nil nil net-address)))
+	      (bbdb-create-internal name nil net-address nil nil "ham sender added by spam.el")))))
+
+      (defun spam-BBDB-register-routine ()
+	(spam-generic-register-routine 
+	 ;; spam function
+	 nil
+	 ;; ham function
+	 (lambda (article)
+	   (spam-enter-ham-BBDB (spam-fetch-field-from-fast article)))))
+
+      (defun spam-check-BBDB ()
+	"Mail from people in the BBDB is never considered spam"
+	(let ((who (message-fetch-field "from")))
+	  (when who
+	    (setq who (regexp-quote (cadr (gnus-extract-address-components who))))
+	    (if (bbdb-search (bbdb-records) nil nil who) nil spam-split-group)))))
+
+  (file-error (progn
+		(setq spam-list-of-checks
+		      (delete (assoc 'spam-use-BBDB spam-list-of-checks)
+			      spam-list-of-checks))
+		(defun spam-check-BBDB ()
+		  message "spam-check-BBDB was invoked, but it shouldn't have")
+		(defun spam-BBDB-register-routine ()
+		  (spam-generic-register-routine nil nil)))))
+
+
+;;;; ifile
+;;; uses ifile-gnus.el from http://www.ai.mit.edu/people/jhbrown/ifile-gnus.html
+;;; check the ifile backend; return nil if the mail was NOT classified as spam
+;;; TODO: we can't (require 'ifile-gnus), because it will insinuate itself automatically
+(defun spam-check-ifile ()
+  (let ((ifile-primary-spam-group spam-split-group))
+    (ifile-spam-filter nil)))
+
+;; TODO: add ifile registration 
+;; We need ifile-gnus.el to support nnimap; we could feel the message
+;; directly to ifile like we do with bogofilter but that's ugly.
+(defun spam-ifile-register-routine ()
+  (spam-generic-register-routine nil nil))
+
+
 ;;;; Blacklists and whitelists.
 
 (defvar spam-whitelist-cache nil)
@@ -445,34 +510,6 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
     (setq spam-whitelist-cache (spam-parse-list spam-whitelist)))
   (if (spam-from-listed-p spam-whitelist-cache) nil spam-split-group))
 
-;;; original idea from Alexander Kotelnikov <sacha@giotto.sj.ru>
-(condition-case nil
-    (progn
-      (require 'bbdb-com)
-      (defun spam-check-bbdb ()
-	"We want messages from people who are in the BBDB not to be split to spam"
-	(let ((who (message-fetch-field "from")))
-	  (when who
-	    (setq who (regexp-quote (cadr (gnus-extract-address-components who))))
-	    (if (bbdb-search (bbdb-records) nil nil who) nil spam-split-group)))))
-  (file-error (setq spam-list-of-checks
-		    (delete (assoc 'spam-use-bbdb spam-list-of-checks)
-			    spam-list-of-checks))))
-
-;; TODO: add BBDB registration
-(defun spam-BBDB-register-routine
-  (spam-generic-register-routine nil nil))
-
-;;; check the ifile backend; return nil if the mail was NOT classified as spam
-;;; TODO: we can't (require) ifile, because it will insinuate itself automatically
-(defun spam-check-ifile ()
-  (let ((ifile-primary-spam-group spam-split-group))
-    (ifile-spam-filter nil)))
-
-;; TODO: add ifile registration
-(defun spam-ifile-register-routine
-  (spam-generic-register-routine nil nil))
-
 (defun spam-check-blacklist ()
   ;; FIXME!  Should it detect when file timestamps change?
   (unless spam-blacklist-cache
@@ -508,14 +545,28 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 	      cache nil)))
     found))
 
-;; TODO: add blacklist and whitelist registrations
-(defun spam-blacklist-register-routine
-  (spam-generic-register-routine nil nil))
-(defun spam-whitelist-register-routine
-  (spam-generic-register-routine nil nil))
+(defun spam-blacklist-register-routine ()
+  (spam-generic-register-routine 
+   ;; the spam function
+   (lambda (article)
+     (let ((from (spam-fetch-field-from-fast article)))
+       (when (stringp from)
+	   (spam-enter-blacklist from))))
+   ;; the ham function
+   nil))
+
+(defun spam-whitelist-register-routine ()
+  (spam-generic-register-routine 
+   ;; the spam function
+   nil 
+   ;; the ham function
+   (lambda (article)
+     (let ((from (spam-fetch-field-from-fast article)))
+       (when (stringp from)
+	   (spam-enter-whitelist from))))))
 
 
-;;;; Training via Bogofilter.   Last updated 2002-09-02.
+;;;; Bogofilter
 
 ;;; See Paul Graham article, at `http://www.paulgraham.com/spam.html'.
 
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 7aa8fd2..4a4ceb7 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -23457,28 +23457,28 @@ Lisp $B%P%C%U%!!<$G$O!"(B@kbd{SPC} $B$G%7%s%0%k%9%F%C%WF0:n!"(B@kbd{M-:} $B
 $BI>2A!"(B@kbd{C-h v} $B$GJQ?t$r8!::!"(B@kbd{q} $B$G<B9T$rCfCG!"$"$k$$(B
 $B$O(B @kbd{c} $B$+(B @kbd{g} $B$G<B9T$r:F3+$9$k$3$H$,$G$-$^$9!#(B
 
-@c TRANSLATEME!
 @cindex elp
 @cindex profile
 @cindex slow
-Sometimes, a problem do not directly generate a elisp error but
-manifests itself by causing Gnus to be very slow.  In these cases, you
-can use @kbd{M-x toggle-debug-on-quit} and press C-j when things are
-slow, and then try to analyze the backtrace (repeating the procedure
-helps isolating the real problem areas).  A fancier approach is to use
-the elisp profiler, ELP.  The profiler is (or should be) fully
-documented elsewhere, but to get you started there are a few steps
-that need to be followed.  First, instrument the part of Gnus you are
-interested in for profiling, e.g. @kbd{M-x elp-instrument-package RET
-gnus} or @kbd{M-x elp-instrument-packagre RET message}.  Then perform
-the operation that is slow and press @kbd{M-x elp-results}.  You will
-then see which operations that takes time, and can debug them further.
-If the entire operation takes much longer than the time spent in the
-slowest function in the profiler output, you probably profiled the
-wrong part of Gnus.  To reset profiling statistics, use @kbd{M-x
-elp-reset-all}.  @kbd{M-x elp-restore-all} is supposed to remove
-profiling, but given the complexities and dynamic code generation in
-Gnus, it might not always work perfectly.
+$B$H$-$I$-!"D>@\$K(B elisp $B$N%(%i!<$r5/$3$5$J$$$b$N$N!"(Bgnus $B$,Hs>o$KCY$/$J$k(B
+$B$?$a$KL@$i$+$K$J$kLdBj$,$"$j$^$9!#$=$s$J>l9g$K$O(B @kbd{M-x
+toggle-debug-on-quit} $B$r;H$C$F!"CY$/$J$C$?$H$-$K(B C-g $B$r2!$7!"$7$+$k8e$K(B
+$B%P%C%/%H%l!<%9$r2r@O$7$F2<$5$$(B ($B$=$N<jB3$-$r7+$jJV$9$3$H$O!"??$NLdBjNN0h(B
+$B$NJ,N%$KLrN)$A$^$9(B)$B!#$h$j>eEy$J<h$jAH$_$O(B elisp $B%W%m%U%!%$%i!<(B ($BLuCm(B: $B%W(B
+$B%m%0%i%`$N<B9T;~$NF0$-$rJ,@O$9$kF;6q(B) ELP $B$r;HMQ$9$k$3$H$G$9!#%W%m%U%!%$(B
+$B%i!<$K$D$$$F$O$I$3$+B>$N>l=j$G40A4$KJ8=q2=$5$l$F$$$k$O$:$G$9$,!"$=$l$r;O(B
+$B$a$k$?$a$KI,MW$J<j=g$r>/!9=q$$$F$*$-$^$7$g$&!#Bh0l$K!"%W%m%U%!%$%k$7$F$_(B
+$B$?$$(B gnus $B$NItJ,$r7WB,$9$k$?$a$N@_Dj$r!"Nc$($P(B @kbd{M-x
+elp-instrument-package RET gnus} $B$d(B @kbd{M-x elp-instrument-package RET
+message} $B$G9T$J$C$F2<$5$$!#$=$7$F!"CY$$F0:n$r9T$J$o$;$F$+$i(B @kbd{M-x
+elp-results} $B$r2!$7$^$7$g$&!#$9$k$H!"$I$NF0:n$,;~4V$r?)$C$F$$$k$+$r8+$F!"(B
+$B8e$G$=$l$i$r%G%P%C%0$9$k$3$H$,$G$-$^$9!#F0:nA4BN$,!"%W%m%U%!%$%i!<$N=PNO(B
+$B$NCf$G$G:G$bCY$$4X?t$GHq$d$5$l$?;~4V$h$j$O$k$+$KD9$/$+$+$k$N$O!"$?$V(B
+$B$s(B gnus $B$N4V0c$C$F$$$kItJ,$r%W%m%U%!%$%k$7$?$;$$$G$7$g$&!#%W%m%U%!%$%k$N(B
+$BE}7W$r%j%;%C%H$9$k$K$O(B @kbd{M-x elp-reset-all} $B$r;H$C$F2<$5$$!#(B@kbd{M-x
+elp-restore-all} $B$O%W%m%U%!%$%k$9$kF0:n$r<h$j=|$/$3$H$K$J$C$F$$$^$9$,!"(B
+gnus $B$K$h$C$FJ#;($K$5$l$+$DF0E*$J%3!<%I@8@.$N1F6A$r<u$1$k$?$a!"$=$l$OI,(B
+$B$:$7$b40A4$KF0:n$9$k$H$O8B$i$J$$$+$b$7$l$^$;$s!#(B
 
 $B$b$71g=u$,M_$7$$$@$1$G$"$l$P!"(B@samp{gnu.emacs.gnus} $B$G?R$M$k$N$,NI$$$G$7$g(B
 $B$&!#;d$O$"$^$jLr$KN)$A$^$;$s!#(B