Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb713af..aa78524 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2002-12-14  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-uu.el (gnus-uu-digest-headers): Mention nil value in docstring.
+
+       * gnus-art.el (gnus-article-header-rank): Last header in
+       gnus-sorted-header-list should have higher rank than non-members.
+
+2002-12-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-agent.el (gnus-close-agent): Don't blank out the list of
+       covered methods.
+
 2002-12-12  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
        * nntp.el (nntp-with-open-group-first-pass): Do not wrap in

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 91e430f..2db7846 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -223,8 +223,7 @@ node `(gnus)Server Buffer'.")
 (gnus-add-shutdown 'gnus-close-agent 'gnus)
 
 (defun gnus-close-agent ()
-  (setq gnus-agent-covered-methods nil
-       gnus-category-predicate-cache nil
+  (setq gnus-category-predicate-cache nil
        gnus-category-group-cache nil
        gnus-agent-spam-hashtb nil)
   (gnus-kill-buffer gnus-agent-overview-buffer))
@@ -1104,21 +1103,19 @@ and that there are no duplicates."
                    (cur (condition-case nil
                             (read (current-buffer))
                           (error nil))))
-               (cond ((or (not (integerp cur))
-                          (not (eq (char-after) ?\t)))
-                      (gnus-message 1
-                                    "Overview buffer contains garbage '%s'." (buffer-substring p (progn (end-of-line) (point))))
-                      (debug nil "Overview buffer contains line that does not begin with a tab-delimited integer."))
+               (cond
+                ((or (not (integerp cur))
+                     (not (eq (char-after) ?\t)))
+                 (gnus-message 1
+                               "Overview buffer contains garbage '%s'." (buffer-substring p (progn (end-of-line) (point)))))
                 ((= cur prev-num)
-                      (gnus-message 1
-                                    "Duplicate overview line for %d" cur)
-                      (debug nil (format "Duplicate overview line for %d" cur))
+                 (gnus-message 1
+                               "Duplicate overview line for %d" cur)
                  (delete-region (point) (progn (forward-line 1) (point))))
                 ((< cur prev-num)
-                      (gnus-message 1 "Overview buffer not sorted!")
-                      (debug nil "Overview buffer not sorted!"))
-                     (t
-                      (setq prev-num cur)))
+                 (gnus-message 1 "Overview buffer not sorted!"))
+                (t
+                 (setq prev-num cur)))
                (forward-line 1)))))))))
 
 (defun gnus-agent-flush-cache ()

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 5d7bf46..7ad0686 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1577,13 +1577,13 @@ Initialized from `text-mode-syntax-table.")
 (defsubst gnus-article-header-rank ()
   "Give the rank of the string HEADER as given by `gnus-sorted-header-list'."
   (let ((list gnus-sorted-header-list)
-       (i 0))
+       (i 1))
     (while list
-      (when (looking-at (car list))
-       (setq list nil))
-      (setq list (cdr list))
-      (incf i))
-    i))
+      (if (looking-at (car list))
+         (setq list nil)
+       (setq list (cdr list))
+       (incf i)))
+      i))
 
 (defun article-hide-headers (&optional arg delete)
   "Hide unwanted headers and possibly sort them as well."

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 8f8c2dc..0cdcc9a 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -298,7 +298,8 @@ so I simply dropped them."
     "^MIME-Version:" "^Content-Disposition:" "^Content-Description:"
     "^Content-ID:" "^User-Agent:" "^X-Face:")
   "*List of regexps to match headers included in digested messages.
-The headers will be included in the sequence they are matched."
+The headers will be included in the sequence they are matched.  If nil
+include all headers."
   :group 'gnus-extract
   :type '(repeat regexp))
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 09fab60..bf73055 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-15  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnusref.tex: Additions.
+
+2002-12-14  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi (Mail): Explain nil value of gnus-uu-digest-headers.
+
 2002-12-10  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
        * gnus.texi (Posting Styles): Clarify the `(header MATCH REGEXP)'

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 6b6293c..c01094f 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -10283,7 +10283,8 @@ Superseding} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
 @item gnus-uu-digest-headers
 @vindex gnus-uu-digest-headers
 \e$BMWLs%a%C%;!<%8\e(B (digested message) \e$B$K4^$^$l$k%X%C%@!<$K9gCW$9$k@55,I=8=$N\e(B
-\e$B%j%9%H$G$9!#%X%C%@!<$O9gCW$7$?=g$K<h$j9~$^$l$^$9!#\e(B
+\e$B%j%9%H$G$9!#%X%C%@!<$O9gCW$7$?=g$K<h$j9~$^$l$^$9!#\e(B@code{nil} \e$B$@$C$?$i!"\e(B
+\e$B$9$Y$F$N%X%C%@!<$r4^$_$^$9!#\e(B
 
 @item gnus-add-to-list
 @vindex gnus-add-to-list

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 1df8399..1b2d51e 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -10797,7 +10797,8 @@ Variables for customizing outgoing mail:
 @item gnus-uu-digest-headers
 @vindex gnus-uu-digest-headers
 List of regexps to match headers included in digested messages.  The
-headers will be included in the sequence they are matched.
+headers will be included in the sequence they are matched.  If
+@code{nil} include all headers.
 
 @item gnus-add-to-list
 @vindex gnus-add-to-list

diff --git a/texi/gnusref.tex b/texi/gnusref.tex
index bc904a5..4ccd3a6 100644 (file)
--- 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{Oct 13th, 2001}
+\def\date{Dec 15th, 2002}
 \def\author{Gnus Bugfixing Girls + Boys $<$bugs@gnus.org$>$}
 
 %%
@@ -53,10 +53,10 @@
 \newcommand{\Notes}{%
   \subsection*{Notes}
   {\esamepage
-    Gnus is complex. Currently it has some 346 interactive (user-callable)
-    functions. Of these 279 are in the two major modes (Group and
+    Gnus is complex. Currently it has some 876 interactive (user-callable)
+    functions. Of these 618 are in the two major modes (Group and
     Summary/Article). Many of these functions have more than one binding, some
-    have 3 or even 4 bindings. The total number of keybindings is 389. So in
+    have 3 or even 4 bindings. The total number of keybindings is 677. So in
     order to save 40\% space, every function is listed only once on this
     \guide, under the ``more logical'' binding. Alternative bindings are given
     in parentheses in the beginning of the description.
@@ -238,6 +238,9 @@
     C-c C-i & Gnus online-manual ({\bf info}).\\
     C-x C-t & {\bf Transpose} two groups.\\
     H f     & Fetch this group's {\bf FAQ} (using ange-ftp).\\
+    H c     & Display this group's {\bf charter}. [Prefix: query for group]\\
+    H C     & Display this group's {\bf control message} (using
+    ange-ftp). [Prefix: query for group]\\
     H v     & (V) Display the Gnus {\bf version} number.\\
     H d     & (C-c C-d) Show the {\bf description} of this group
     [Prefix: re-read from server].\\