From f106764341ab2cff38101beee56ff9a0a2f96bf2 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 13 Jan 2004 01:00:57 +0000
Subject: [PATCH] Synch to No Gnus 200401122258.

---
 lisp/ChangeLog    |   10 ++++++++++
 lisp/gnus-srvr.el |   20 ++++++++++++++------
 lisp/spam.el      |   22 ++++++----------------
 texi/ChangeLog    |    6 ++++++
 texi/gnus-ja.texi |   23 +++++++++++++----------
 texi/gnus.texi    |   22 ++++++++++++----------
 6 files changed, 61 insertions(+), 42 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11dd36f..cb13757 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-12  Jesper Harder  <harder@ifa.au.dk>
+
+	* gnus-srvr.el (gnus-browse-foreign-server): Reduce consing.
+
+2004-01-12  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el (spam-get-article-as-string): updated to use
+	gnus-request-article-this-buffer, much simpler
+	(spam-get-article-as-buffer): removed
+
 2004-01-12  Kai Grossjohann  <kai.grossjohann@mci.com>
 
 	* message.el (message-expand-name): Use EUDC if the user uses
diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index 9bb79ce..3de8794 100644
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -797,18 +797,26 @@ gnus-method-to-server."
 	     (prog1 (1+ (point))
 	       (insert
 		(format "%c%7d: %s\n"
-			(let ((level (gnus-group-level
-				      (concat prefix (setq name (car group))))))
+			(let ((level
+			       (if (string= prefix "")
+				   (gnus-group-level (setq name (car group)))
+				 (gnus-group-level
+				  (concat prefix (setq name (car group)))))))
 			  (cond
 			   ((<= level gnus-level-subscribed) ? )
 			   ((<= level gnus-level-unsubscribed) ?U)
 			   ((= level gnus-level-zombie) ?Z)
 			   (t ?K)))
 			(max 0 (- (1+ (cddr group)) (cadr group)))
-			(decode-coding-string
-			 name
-			 (inline (gnus-group-name-charset method name))))))
-	     (list 'gnus-group name))))
+			;; Don't decode if name is ASCII
+			(if (and (fboundp 'detect-coding-string)
+				 (eq (detect-coding-string name t) 'undecided))
+			    name
+			  (decode-coding-string
+			   name
+			   (inline (gnus-group-name-charset method name)))))))
+	     (list 'gnus-group name)
+	     )))
 	(switch-to-buffer (current-buffer)))
       (goto-char (point-min))
       (gnus-group-position-point)
diff --git a/lisp/spam.el b/lisp/spam.el
index 22c1dcf..4681d7b 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -788,22 +788,12 @@ Respects the process/prefix convention."
     (spam-ham-copy-or-move-routine nil groups)))
 
 (defun spam-get-article-as-string (article)
-  (let ((article-buffer (spam-get-article-as-buffer article))
-	article-string)
-    (when article-buffer
-      (save-window-excursion
-	(set-buffer article-buffer)
-	(setq article-string (buffer-string))))
-    article-string))
-
-(defun spam-get-article-as-buffer (article)
-  (let ((article-buffer))
-    (when (numberp article)
-      (save-window-excursion
-	(gnus-summary-goto-subject article)
-	(gnus-summary-show-article t)
-	(setq article-buffer (get-buffer gnus-article-buffer))))
-    article-buffer))
+  (when (numberp article)
+    (with-temp-buffer
+      (gnus-request-article-this-buffer
+       article
+       gnus-newsgroup-name)
+      (buffer-string))))
 
 ;; disabled for now
 ;; (defun spam-get-article-as-filename (article)
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 055c6b4..9e319cb 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-12  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus.texi (The problem of spam): fixed so many countries and
+	continents are used as examples of why blocking by country blocks
+	is a bad idea.
+
 2004-01-11  Simon Josefsson  <jas@extundo.com>
 
 	* gnus.texi (The problem of spam): Fix, reported by Cheng Gao
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index e282049..3566fcc 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -21361,16 +21361,19 @@ Spam $B$N=|5n(B (filtering) $B$X$N:G$bC1=c$J<h$jAH$_$O!"%a!<%k%5!<%P!<$G!"$"$
 $B<h$k$N$J$i$P!"(B@samp{vmadmin.com} $B$rAK;_$9$l$P$h$m$7$$!#(B
 @samp{$B%P%$%"%0%i(B} $B$K4X$9$k%a%C%;!<%8$r(B 200$BDL<u$1<h$k$N$J$i$P!"(B
 @samp{$B%P%$%"%0%i(B} $B$r4^$`$9$Y$F$N%a%C%;!<%8$r<N$F$F$7$^$($P$h$m$7$$!#Nc$((B
-$B$P!"(BElbonia $B9q$+$i$?$/$5$s$N(B spam $B$,$d$C$FMh$k$N$J$i$P!"(BElbonia $B9q$N(B IP
-$B$+$iMh$k$9$Y$F$N%a!<%k$r_I2a$9$l$P$h$m$7$$!#(B
-
-$B$3$l$O!";DG0$J$,$i@5Ev$JEE;R%a!<%k$r<N$F$k$?$a$N$9$0$l$?J}K!$G$9!#Nc$($P!"(B
-$B$H$F$b<(:6$KIY$s$GM-1W$J(B RISKS $B%@%$%8%'%9%H$O!"$=$l$,(B spam $B%a%C%;!<%8$H(B
-$B6&DL$N8l$r(B @strong{$B4^$s$G(B} $B$$$k$?$a$K!"G.?4$9$.$k%a!<%k_I2a4o$K$h$C$FAK(B
-$B;_$5$l$F$7$^$$$^$9!#$"$J$?$K@\?($7$h$&$H$9$kCO0hA4BN$rIu$89~$a$F$7$^$&4m(B
-$B81$bL@$i$+$G$9!#$G$9$+$i!"$"$J$?$KA*Br8"$,$"$k$N$J$i$P!"$=$s$J$3$H$O$7$J(B
-$B$$$G2<$5$$!#$=$l$G$b$J$*8IN)$7$?4D6-$G$O!"Cm0U?<$/;H$&$3$H$K$h$C$FD>@\$N(B
-$B_I2a$OM-1W$K$J$jF@$^$9!#(B
+$B$P%V%k%,%j%"$+$i$?$/$5$s$N(B spam $B$,$d$C$FMh$k$N$J$i$P!"%V%k%,%j%"$N(B IP $B$+(B
+$B$iMh$k$9$Y$F$N%a!<%k$r_I2a$9$l$P$h$m$7$$!#(B
+
+$B$3$l$O!";DG0$J$,$i@5Ev$JEE;R%a!<%k$r<N$F$k$?$a$N$9$0$l$?J}K!$G$9!#$"$J$?(B
+$B$K@\?($7$h$&$H$9$k9q(B ($B%V%k%,%j%"!"%N%k%&%'!<!"%J%$%8%'%j%"!"Cf9q!"Ey(B) $BA4(B
+$BBN!"$^$?$OBgN&(B ($B%"%8%"!"%"%U%j%+!"%h!<%m%C%Q!"Ey(B) $B$5$($bIu$89~$a$F$7$^$&(B
+$B4m81$OL@$i$+$J$N$G!"$"$J$?$KA*Br8"$,$"$k$N$J$i$P!"$=$s$J$3$H$O$7$J$$$G2<(B
+$B$5$$!#(B
+
+$B$b$&0l$D$NNc$H$7$F!"$H$F$b<(:6$KIY$s$GM-1W$J(B RISKS $B%@%$%8%'%9%H$O!"$=$l(B
+$B$,(B spam $B%a%C%;!<%8$H6&DL$N8l$r(B @strong{$B4^$s$G(B} $B$$$k$?$a$K!"G.?4$9$.$k%a!<(B
+$B%k_I2a4o$K$h$C$FAK;_$5$l$F$7$^$$$^$9!#$=$l$G$b$J$*8IN)$7$?4D6-$G$O!"Cm0U(B
+$B?<$/;H$&$3$H$K$h$C$FD>@\$N_I2a$OM-1W$K$J$jF@$^$9!#(B
 
 $B$b$&0l$D$NEE;R%a!<%k_I2a$X$N<h$jAH$_$OJ,;67?(B spam $B=hM}$G!"(BDCC ($BLuCm(B:
 Distributed Checksum Clearinghouse --
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 592e21a..38328bc 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -22238,16 +22238,18 @@ server or when you sort through incoming mail.  If you get 200 spam
 messages per day from @samp{random-address@@vmadmin.com}, you block
 @samp{vmadmin.com}.  If you get 200 messages about @samp{VIAGRA}, you
 discard all messages with @samp{VIAGRA} in the message.  If you get
-lots of spam from Elbonia, for example, you try to filter all mail
-from Elbonian IPs.
-
-This, unfortunately, is a great way to discard legitimate e-mail.  For
-instance, the very informative and useful RISKS digest has been
-blocked by overzealous mail filters because it @strong{contained}
-words that were common in spam messages.  The risks of blocking a
-whole country from contacting you should also be obvious, so don't do
-it if you have the choice.  Nevertheless, in isolated cases, with
-great care, direct filtering of mail can be useful.
+lots of spam from Bulgaria, for example, you try to filter all mail
+from Bulgarian IPs.  
+
+This, unfortunately, is a great way to discard legitimate e-mail.  The
+risks of blocking a whole country (Bulgaria, Norway, Nigeria, China,
+etc.) or even a continent (Asia, Africa, Europe, etc.) from contacting
+you should be obvious, so don't do it if you have the choice.
+
+In another instance, the very informative and useful RISKS digest has
+been blocked by overzealous mail filters because it @strong{contained}
+words that were common in spam messages.  Nevertheless, in isolated
+cases, with great care, direct filtering of mail can be useful.
 
 Another approach to filtering e-mail is the distributed spam
 processing, for instance DCC implements such a system.  In essence,
-- 
1.7.10.4