From: yamaoka <yamaoka>
Date: Sun, 5 Jan 2003 23:23:22 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_12-00-quimby~50
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f5632cd116bec095876a37c61c62a6c270fe926;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7d2524..ba29472 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2003-01-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-xmas.el (gnus-xmas-group-startup-message): Bind the oort
+	color as `gnus-group-startup-message' does.
+
+2003-01-05  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el: fixed line lengths to 80 chars or less
+
+	* gnus-sum.el (gnus-read-mark-p): added the spam-mark as a
+	"not-read" mark
+	(gnus-summary-mark-forward): added the spam-mark to the list of
+	marks not to be marked as "read" when viewed
+
 2003-01-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-msg.el (gnus-inews-make-draft): Quote article-reply. 
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 6dace4b..a41fbad 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -2857,6 +2857,7 @@ article number."
 This is all marks except unread, ticked, dormant, and expirable."
   (not (or (= mark gnus-unread-mark)
 	   (= mark gnus-ticked-mark)
+	   (= mark gnus-spam-mark)
 	   (= mark gnus-dormant-mark)
 	   (= mark gnus-expirable-mark))))
 
@@ -9584,7 +9585,7 @@ If NO-EXPIRE, auto-expiry will be inhibited."
 	(gnus-summary-goto-unread
 	 (and gnus-summary-goto-unread
 	      (not (eq gnus-summary-goto-unread 'never))
-	      (not (memq mark (list gnus-unread-mark
+	      (not (memq mark (list gnus-unread-mark gnus-spam-mark
 				    gnus-ticked-mark gnus-dormant-mark)))))
 	(n (abs n))
 	(mark (or mark gnus-del-mark)))
diff --git a/lisp/spam.el b/lisp/spam.el
index 65387d0..1c7417a 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -138,12 +138,15 @@ All unmarked article in such group receive the spam mark on group entry."
   :type '(repeat (string :tag "Group"))
   :group 'spam)
 
-(defcustom spam-blackhole-servers '("bl.spamcop.net" "relays.ordb.org" "dev.null.dk" "relays.visi.com")
+(defcustom spam-blackhole-servers '("bl.spamcop.net" "relays.ordb.org" 
+				    "dev.null.dk" "relays.visi.com")
   "List of blackhole servers."
   :type '(repeat (string :tag "Server"))
   :group 'spam)
 
-(defcustom spam-ham-marks (list 'gnus-del-mark 'gnus-read-mark 'gnus-killed-mark 'gnus-kill-file-mark 'gnus-low-score-mark)
+(defcustom spam-ham-marks (list 'gnus-del-mark 'gnus-read-mark 
+				'gnus-killed-mark 'gnus-kill-file-mark 
+				'gnus-low-score-mark)
   "Marks considered as being ham (positively not spam).
 Such articles will be processed as ham (non-spam) on group exit."
   :type '(set
@@ -199,7 +202,8 @@ Such articles will be transmitted to `bogofilter -s' on group exit."
 ;; (and previously X-NoSpam) are produced by the `NoSpam' tool, which has
 ;; never been published, so it might not be reasonable leaving it in the
 ;; list.
-(defcustom spam-bogofilter-spaminfo-header-regexp "^X-\\(jf\\|Junk\\|NoSpam\\|Spam\\|SB\\)[^:]*:"
+(defcustom spam-bogofilter-spaminfo-header-regexp 
+  "^X-\\(jf\\|Junk\\|NoSpam\\|Spam\\|SB\\)[^:]*:"
   "Regexp for spam markups in headers.
 Markup from spam recognisers, as well as `Xref', are to be removed from
 articles before they get registered by Bogofilter."
@@ -226,12 +230,14 @@ articles before they get registered by Bogofilter."
 (defun spam-group-spam-contents-p (group)
   (if (stringp group)
       (or (member group spam-junk-mailgroups)
-	  (memq 'gnus-group-spam-classification-spam (gnus-parameter-spam-contents group)))
+	  (memq 'gnus-group-spam-classification-spam 
+		(gnus-parameter-spam-contents group)))
     nil))
   
 (defun spam-group-ham-contents-p (group)
   (if (stringp group)
-      (memq 'gnus-group-spam-classification-ham (gnus-parameter-spam-contents group))
+      (memq 'gnus-group-spam-classification-ham 
+	    (gnus-parameter-spam-contents group))
     nil))
 
 (defun spam-group-processor-p (group processor)
@@ -274,7 +280,8 @@ articles before they get registered by Bogofilter."
 
   ;; Only for spam groups, we expire and maybe move articles
   (when (spam-group-spam-contents-p gnus-newsgroup-name)
-    (spam-mark-spam-as-expired-and-move-routine (gnus-parameter-spam-process-destination gnus-newsgroup-name)))
+    (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)
     (when (spam-group-processor-whitelist-p gnus-newsgroup-name)
@@ -286,7 +293,8 @@ articles before they get registered by Bogofilter."
 (add-hook 'gnus-summary-prepare-exit-hook 'spam-summary-prepare-exit)
 
 (defun spam-mark-junk-as-spam-routine ()
-  ;; check the global list of group names spam-junk-mailgroups and the group parameters
+  ;; check the global list of group names spam-junk-mailgroups and the
+  ;; group parameters
   (when (spam-group-spam-contents-p gnus-newsgroup-name)
     (let ((articles gnus-newsgroup-articles)
 	  article)
@@ -308,10 +316,12 @@ articles before they get registered by Bogofilter."
  
 (defun spam-generic-register-routine (spam-func ham-func)
   (let ((articles gnus-newsgroup-articles)
-	article mark ham-articles spam-articles spam-mark-values ham-mark-values)
+	article mark ham-articles spam-articles spam-mark-values 
+	ham-mark-values)
 
-    ;; marks are stored as symbolic values, so we have to dereference them for memq to work
-    ;; we wouldn't have to do this if gnus-summary-article-mark returned a symbol.
+    ;; marks are stored as symbolic values, so we have to dereference
+    ;; them for memq to work we wouldn't have to do this if
+    ;; gnus-summary-article-mark returned a symbol.
     (dolist (mark spam-ham-marks)
       (push (symbol-value mark) ham-mark-values))
 
@@ -325,12 +335,16 @@ 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)
-      (mapc ham-func ham-articles))	; we use mapc because unlike mapcar it discards the return values
+      (mapc ham-func ham-articles))	; we use mapc because unlike
+					; mapcar it discards the
+					; return values
     (when (and spam-articles spam-func)
-      (mapc spam-func spam-articles))))	; we use mapc because unlike mapcar it discards the return values
+      (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"
+  "Fetch the `from' field quickly, using the 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))))
@@ -399,7 +413,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 	    (if spam-use-dig
 		(let ((query-result (query-dig query-string)))
 		  (when query-result
-		    (message "spam detected with blackhole check of relay %s (dig query result '%s')" query-string query-result)
+		    (message "spam: positive blackhole check '%s'" query-result)
 		    (push (list ip server query-result)
 			  matches)))
 	      ;; else, if not using dig.el
@@ -409,8 +423,8 @@ 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>
+;;;; 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
@@ -427,7 +441,8 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 	    (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")))))
+	      (bbdb-create-internal name nil net-address nil nil 
+				    "ham sender added by spam.el")))))
 
       (defun spam-BBDB-register-routine ()
 	(spam-generic-register-routine 
@@ -441,8 +456,10 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 	"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)))))
+	    (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
@@ -455,9 +472,15 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 
 
 ;;;; 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
+
+;;; 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)))
@@ -566,14 +589,15 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 
 ;;; See Paul Graham article, at `http://www.paulgraham.com/spam.html'.
 
-;;; This page is for those wanting to control spam with the help of Eric
-;;; Raymond's speedy Bogofilter, see http://www.tuxedo.org/~esr/bogofilter.
-;;; This has been tested with a locally patched copy of version 0.4.
+;;; This page is for those wanting to control spam with the help of
+;;; Eric Raymond's speedy Bogofilter, see
+;;; http://www.tuxedo.org/~esr/bogofilter.  This has been tested with
+;;; a locally patched copy of version 0.4.
 
-;;; Make sure Bogofilter is installed.  Bogofilter internally uses Judy fast
-;;; associative arrays, so you need to install Judy first, and Bogofilter
-;;; next.  Fetch both distributions by visiting the following links and
-;;; downloading the latest version of each:
+;;; Make sure Bogofilter is installed.  Bogofilter internally uses
+;;; Judy fast associative arrays, so you need to install Judy first,
+;;; and Bogofilter next.  Fetch both distributions by visiting the
+;;; following links and downloading the latest version of each:
 ;;;
 ;;;     http://sourceforge.net/projects/judy/
 ;;;     http://www.tuxedo.org/~esr/bogofilter/
@@ -584,14 +608,15 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 ;;;     make
 ;;;     make install
 ;;;
-;;; You will likely need to become super-user for the last step.  Then, unpack
-;;; the Bogofilter distribution and enter its main directory:
+;;; You will likely need to become super-user for the last step.
+;;; Then, unpack the Bogofilter distribution and enter its main
+;;; directory:
 ;;;
 ;;;     make
 ;;;     make install
 ;;;
-;;; Here as well, you need to become super-user for the last step.  Now,
-;;; initialize your word lists by doing, under your own identity:
+;;; Here as well, you need to become super-user for the last step.
+;;; Now, initialize your word lists by doing, under your own identity:
 ;;;
 ;;;     mkdir ~/.bogofilter
 ;;;     touch ~/.bogofilter/badlist
@@ -599,52 +624,59 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 ;;;
 ;;; These two files are text files you may edit, but you normally don't!
 
-;;; The `M-d' command gets added to Gnus summary mode, marking current article
-;;; as spam, showing it with the `H' mark.  Whenever you see a spam article,
-;;; make sure to mark its summary line with `M-d' before leaving the group.
-;;; Some groups, as per variable `spam-junk-mailgroups' below, receive articles
-;;; from Gnus splitting on clues added by spam recognisers, so for these
-;;; groups, we tack an `H' mark at group entry for all summary lines which
-;;; would otherwise have no other mark.  Make sure to _remove_ `H' marks for
-;;; any article which is _not_ genuine spam, before leaving such groups: you
-;;; may use `M-u' to "unread" the article, or `d' for declaring it read the
-;;; non-spam way.  When you leave a group, all `H' marked articles, saved or
-;;; unsaved, are sent to Bogofilter which will study them as spam samples.
+;;; The `M-d' command gets added to Gnus summary mode, marking current
+;;; article as spam, showing it with the `H' mark.  Whenever you see a
+;;; spam article, make sure to mark its summary line with `M-d' before
+;;; leaving the group.  Some groups, as per variable
+;;; `spam-junk-mailgroups' below, receive articles from Gnus splitting
+;;; on clues added by spam recognisers, so for these groups, we tack
+;;; an `H' mark at group entry for all summary lines which would
+;;; otherwise have no other mark.  Make sure to _remove_ `H' marks for
+;;; any article which is _not_ genuine spam, before leaving such
+;;; groups: you may use `M-u' to "unread" the article, or `d' for
+;;; declaring it read the non-spam way.  When you leave a group, all
+;;; `H' marked articles, saved or unsaved, are sent to Bogofilter
+;;; which will study them as spam samples.
 
 ;;; Messages may also be deleted in various other ways, and unless
-;;; `spam-ham-marks-form' gets overridden below, marks `R' and `r' for default
-;;; read or explicit delete, marks `X' and 'K' for automatic or explicit
-;;; kills, as well as mark `Y' for low scores, are all considered to be
-;;; associated with articles which are not spam.  This assumption might be
-;;; false, in particular if you use kill files or score files as means for
-;;; detecting genuine spam, you should then adjust `spam-ham-marks-form'.  When
-;;; you leave a group, all _unsaved_ articles bearing any the above marks are
-;;; sent to Bogofilter which will study these as not-spam samples.  If you
-;;; explicit kill a lot, you might sometimes end up with articles marked `K'
-;;; which you never saw, and which might accidentally contain spam.  Best is
-;;; to make sure that real spam is marked with `H', and nothing else.
-
-;;; All other marks do not contribute to Bogofilter pre-conditioning.  In
-;;; particular, ticked, dormant or souped articles are likely to contribute
-;;; later, when they will get deleted for real, so there is no need to use
-;;; them prematurely.  Explicitly expired articles do not contribute, command
-;;; `E' is a way to get rid of an article without Bogofilter ever seeing it.
-
-;;; In a word, with a minimum of care for associating the `H' mark for spam
-;;; articles only, Bogofilter training all gets fairly automatic.  You should
-;;; do this until you get a few hundreds of articles in each category, spam
-;;; or not.  The shell command `head -1 ~/.bogofilter/*' shows both article
-;;; counts.  The command `S S' in summary mode, either for debugging or for
-;;; curiosity, triggers Bogofilter into displaying in another buffer the
-;;; "spamicity" score of the current article (between 0.0 and 1.0), together
-;;; with the article words which most significantly contribute to the score.
-
-;;; The real way for using Bogofilter, however, is to have some use tool like
-;;; `procmail' for invoking it on message reception, then adding some
-;;; recognisable header in case of detected spam.  Gnus splitting rules might
-;;; later trip on these added headers and react by sorting such articles into
-;;; specific junk folders as per `spam-junk-mailgroups'.  Here is a possible
-;;; `.procmailrc' contents (still untested -- please tell me how it goes):
+;;; `spam-ham-marks-form' gets overridden below, marks `R' and `r' for
+;;; default read or explicit delete, marks `X' and 'K' for automatic
+;;; or explicit kills, as well as mark `Y' for low scores, are all
+;;; considered to be associated with articles which are not spam.
+;;; This assumption might be false, in particular if you use kill
+;;; files or score files as means for detecting genuine spam, you
+;;; should then adjust `spam-ham-marks-form'.  When you leave a group,
+;;; all _unsaved_ articles bearing any the above marks are sent to
+;;; Bogofilter which will study these as not-spam samples.  If you
+;;; explicit kill a lot, you might sometimes end up with articles
+;;; marked `K' which you never saw, and which might accidentally
+;;; contain spam.  Best is to make sure that real spam is marked with
+;;; `H', and nothing else.
+
+;;; All other marks do not contribute to Bogofilter pre-conditioning.
+;;; In particular, ticked, dormant or souped articles are likely to
+;;; contribute later, when they will get deleted for real, so there is
+;;; no need to use them prematurely.  Explicitly expired articles do
+;;; not contribute, command `E' is a way to get rid of an article
+;;; without Bogofilter ever seeing it.
+
+;;; In a word, with a minimum of care for associating the `H' mark for
+;;; spam articles only, Bogofilter training all gets fairly automatic.
+;;; You should do this until you get a few hundreds of articles in
+;;; each category, spam or not.  The shell command `head -1
+;;; ~/.bogofilter/*' shows both article counts.  The command `S S' in
+;;; summary mode, either for debugging or for curiosity, triggers
+;;; Bogofilter into displaying in another buffer the "spamicity" score
+;;; of the current article (between 0.0 and 1.0), together with the
+;;; article words which most significantly contribute to the score.
+
+;;; The real way for using Bogofilter, however, is to have some use
+;;; tool like `procmail' for invoking it on message reception, then
+;;; adding some recognisable header in case of detected spam.  Gnus
+;;; splitting rules might later trip on these added headers and react
+;;; by sorting such articles into specific junk folders as per
+;;; `spam-junk-mailgroups'.  Here is a possible `.procmailrc' contents
+;;; (still untested -- please tell me how it goes):
 ;;;
 ;;; :0HBf:
 ;;; * ? bogofilter
@@ -681,10 +713,12 @@ spamicity coefficient of each, and the overall article spamicity."
 
 (defun spam-bogofilter-register-routine ()
   (let ((articles gnus-newsgroup-articles)
-	article mark ham-articles spam-articles spam-mark-values ham-mark-values)
+	article mark ham-articles spam-articles spam-mark-values 
+	ham-mark-values)
 
-    ;; marks are stored as symbolic values, so we have to dereference them for memq to work
-    ;; we wouldn't have to do this if gnus-summary-article-mark returned a symbol.
+    ;; marks are stored as symbolic values, so we have to dereference
+    ;; them for memq to work we wouldn't have to do this if
+    ;; gnus-summary-article-mark returned a symbol.
     (dolist (mark spam-ham-marks)
       (push (symbol-value mark) ham-mark-values))
 
@@ -705,7 +739,8 @@ spamicity coefficient of each, and the overall article spamicity."
 (defun spam-bogofilter-articles (type option articles)
   (let ((output-buffer (get-buffer-create spam-bogofilter-output-buffer-name))
 	(article-copy (get-buffer-create " *Bogofilter Article Copy*"))
-	(remove-regexp (concat spam-bogofilter-spaminfo-header-regexp "\\|Xref:"))
+	(remove-regexp (concat spam-bogofilter-spaminfo-header-regexp 
+			       "\\|Xref:"))
 	(counter 0)
 	prefix process article)
     (when type
diff --git a/texi/ChangeLog b/texi/ChangeLog
index a80552d..1e3cd88 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,15 @@
+2003-01-05  Jesper Harder  <harder@ifa.au.dk>
+
+	* refcard.tex: Fix pagebreak.
+
+	* gnusref.tex: Additions and fixes.
+
+	* booklet.tex: Add missing sections.
+
+	* gnus.texi (Mail Group Commands): Fix typo.
+	(XEmacs): Add sh-script.
+	(Article Washing): Fix.
+
 2003-01-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus.texi (Setting Process Marks): Addition.
diff --git a/texi/booklet.tex b/texi/booklet.tex
index 5ae0821..b6ee207 100644
--- a/texi/booklet.tex
+++ b/texi/booklet.tex
@@ -43,7 +43,7 @@
     \GroupTopicsGeneral
     \subsubsection*{Topic Sorting}
     \TopicSorting
-%
+\pagebreak
 % summary-mode
 \section*{Summary-Mode}
 \SummaryModeGeneral
@@ -100,6 +100,12 @@
 \ArticleModeGeneral
     \subsection*{Wash the Article-Buffer}
     \WashArticle
+    \subsubsection*{Blank Lines and Whitespace}
+    \BlankAndWhitespace
+    \subsubsection*{Picons, X-faces, Smileys}
+    \Picons
+    \subsubsection*{Time and Date}
+    \TimeAndDate
     \subsection*{Hide/Highlight Parts of the Article}
     \HideHighlightArticle
     \subsection*{MIME operations from the Article-Buffer (reading)}
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index bba744c..cc9de25 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -288,7 +288,8 @@
 
 \thispagestyle{empty}
 
-Copyright \copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+Copyright \copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003
 Free Software Foundation, Inc.
 
 
@@ -336,7 +337,7 @@ This file documents gnus, the GNU Emacs newsreader.
 
 このファイルは GNU Emacs のニュースリーダである gnus に関する説明書です。
 
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
         Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -384,7 +385,8 @@ license to the document, as described in section 6 of the license.
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003
         Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -8213,10 +8215,10 @@ URL に含まれる改行を削除します。いくつかのメイラーは、行を短くするために
 接頭辞が与えられると、何の文字集合 (charset) として扱うかを尋ねられます。
 
 @vindex gnus-article-wash-function
-ディフォルトでは @sc{html} の変換に @code{mm-inline-text-html-renderer}
-(@pxref{Customization, , , emacs-mime}) で設定された関数を使いますが、こ
-れは変数 @code{gnus-article-wash-function} で制御されます。使うことがで
-きる、あらかじめ用意された関数は以下の通りです。
+ディフォルトでは @sc{html} の変換に @code{mm-text-html-renderer}
+(@pxref{(emacs-mime)Display Customization}) で設定された関数を使いますが、
+これは変数 @code{gnus-article-wash-function} で制御されます。使うことが
+できる、あらかじめ用意された関数は以下の通りです。
 
 @table @code
 @item w3
@@ -21597,9 +21599,9 @@ but at the common table.@*
 XEmacs はパッケージの蒐集として配布されています。gnus の XEmacs パッケー
 ジが必要とするものは何であれ、あなたはインストールすべきです。今のところ
 必要なのは @samp{gnus}, @samp{w3}, @samp{mh-e}, @samp{mailcrypt},
-@samp{rmail}, @samp{eterm}, @samp{mail-lib}, @samp{xemacs-base} および
-@samp{fsf-compat} です。モールス復号のためには @samp{misc-games} パッケー
-ジが必要です。
+@samp{rmail}, @samp{eterm}, @samp{mail-lib}, @samp{xemacs-base},
+@samp{sh-script} および @samp{fsf-compat} です。モールス復号のために
+は @samp{misc-games} パッケージが必要です。
 
 @node History
 @section 歴史
diff --git a/texi/gnus.texi b/texi/gnus.texi
index c19e56e..79881de 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -288,7 +288,8 @@
 
 \thispagestyle{empty}
 
-Copyright \copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+Copyright \copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003
 Free Software Foundation, Inc.
 
 
@@ -317,7 +318,7 @@ license to the document, as described in section 6 of the license.
 
 This file documents gnus, the GNU Emacs newsreader.
 
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
         Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -347,7 +348,8 @@ license to the document, as described in section 6 of the license.
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003
         Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -8365,10 +8367,10 @@ If a prefix is given, a charset will be asked for.
 
 @vindex gnus-article-wash-function
 The default is to use the function specified by
-@code{mm-inline-text-html-renderer} (@pxref{Customization, , , emacs-mime})
-to convert the @sc{html}, but this is controlled by the
-@code{gnus-article-wash-function} variable.  Pre-defined functions you
-can use include:
+@code{mm-text-html-renderer} (@pxref{(emacs-mime)Display
+Customization}) to convert the @sc{html}, but this is controlled by
+the @code{gnus-article-wash-function} variable.  Pre-defined functions
+you can use include:
 
 @table @code
 @item w3
@@ -9656,7 +9658,7 @@ will tell you (@code{gnus-summary-respool-query}).
 @kindex B t (Summary)
 @findex gnus-summary-respool-trace
 Similarly, this command will display all fancy splitting patterns used
-when repooling, if any (@code{gnus-summary-respool-trace}).
+when respooling, if any (@code{gnus-summary-respool-trace}).
 
 @item B p
 @kindex B p (Summary)
@@ -22046,8 +22048,8 @@ XEmacs is distributed as a collection of packages.  You should install
 whatever packages the Gnus XEmacs package requires.  The current
 requirements are @samp{gnus}, @samp{w3}, @samp{mh-e},
 @samp{mailcrypt}, @samp{rmail}, @samp{eterm}, @samp{mail-lib},
-@samp{xemacs-base}, and @samp{fsf-compat}.  The @samp{misc-games}
-package is required for Morse decoding.
+@samp{xemacs-base}, @samp{sh-script} and @samp{fsf-compat}.  The
+@samp{misc-games} package is required for Morse decoding.
 
 
 @node History
diff --git a/texi/gnusref.tex b/texi/gnusref.tex
index 4ccd3a6..32d11be 100644
--- a/texi/gnusref.tex
+++ b/texi/gnusref.tex
@@ -1,7 +1,7 @@
 %% include file for the Gnus refcard and booklet
 
 \def\progver{5.10}\def\refver{5.10-1} % program and refcard versions
-\def\date{Dec 15th, 2002}
+\def\date{Jan, 2003}
 \def\author{Gnus Bugfixing Girls + Boys $<$bugs@gnus.org$>$}
 
 %%
@@ -37,7 +37,7 @@
     Copyright \copyright\ 1995 Vladimir Alexiev
     $<$vladimir@cs.ualberta.ca$>$.\\*
     Copyright \copyright\ 2000 Felix Natter $<$fnatter@gmx.net$>$.\\*
-    Copyright \copyright\ 2001, 2002 \author.\\*
+    Copyright \copyright\ 2001, 2002, 2003 \author.\\*
     Created from the Gnus manual Copyright \copyright\ 1994 Lars Magne
     Ingebrigtsen.\\*
     and the Emacs Help Bindings feature (C-h b).\\*
@@ -331,7 +331,7 @@
   \newcommand{\GroupTopicsGeneral}{%
     {\esamepage
       Topics are ``categories'' for groups. Press t in the group-buffer to
-      toggle gnus-topic-mode (C-c C-i g Group Topics RET).
+      toggle gnus-topic-mode (C-c C-i g Group Topics RET).\\*
       \begin{keys}{C-c C-x}
         T n     & Prompt for topic {\bf name} and create it.\\
         T m     & {\bf Move} the current group to some other topic [p/p].\\
@@ -488,6 +488,7 @@
         C-c C-s C-c & Sort the summary-buffer by length.\\
         C-c C-s C-n & Sort the summary-buffer by article {\bf number}.\\
         C-c C-s C-s & Sort the summary-buffer by {\bf subject}.\\
+        C-c C-s C-r & Sort the summary-buffer {\bf randomly}.\\
         C-c C-s C-o & Sort the summary-buffer using the default method.\\
       \end{keys}
       With a prefix these functions sort in reverse order.
@@ -791,6 +792,7 @@
       /x   & Limit depending on ``extra'' headers.\\
       /u   & (x) Limit to {\bf unread} articles.
       [Prefix: also exclude ticked and dormant articles]\\
+      /.   & Limit to unseen articles.\\
       /m   & Limit to articles marked with specified {\bf mark}.\\
       /t   & Ask for a number and exclude articles younger than that many days.
       [Prefix: exclude older articles]\\
@@ -835,7 +837,7 @@
 \newcommand{\PostReplyetc}{% formerly \Ssubmap
   {\esamepage
     These commands put you in a separate news or mail buffer. See the section
-    about composing messages for more information.
+    about composing messages for more information.\\*
                                 %After
                                 %editing the article, send it by pressing C-c C-c.  If you are in a
                                 %foreign group and want to post the article using the foreign server, give
@@ -1010,7 +1012,7 @@
   }
 
 \newcommand{\MsgCompositionGeneral}{%
-  Press C-c ? in the composition-buffer to get this information.
+  Press C-c ? in the composition-buffer to get this information.\\*
   {\esamepage
     \begin{keys}{C-c C-m}
                                 % sending
@@ -1038,7 +1040,7 @@
   }
 
 \newcommand{\MsgCompositionMovementArticle}{%
-  The following functions create the header-field if necessary.
+  The following functions create the header-field if necessary.\\*
   {\esamepage
     \begin{keys}{C-c C-f C-u}
       C-c TAB & Move to \textbf{signature}.\\
diff --git a/texi/refcard.tex b/texi/refcard.tex
index cf72fb3..92ed19d 100644
--- a/texi/refcard.tex
+++ b/texi/refcard.tex
@@ -140,7 +140,6 @@
 %
     \subsection*{Summary-Unplugged}
     \SummaryUnplugged
-\pagebreak    
     \subsection*{Mail-Group Commands}
     \MailGroups
     \subsection*{Draft-Group Commands}