Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 797, 800, 802)

   - Merge from emacs--rel--22

 * gnus--rel--5.10  (patch 233-234)

   - Merge from emacs--devo--0
   - Update from CVS

2007-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-sum.el (gnus-summary-catchup): Don't recognize cached articles
   as unfetched articles.

2007-07-02  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-start.el (gnus-level-unsubscribed): Improve doc string.

2007-06-26  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-article-summary-command-nosave)
   (gnus-article-read-summary-keys): Don't set the 3rd arg of
   pop-to-buffer for XEmacs.

2007-07-02  Reiner Steib  <Reiner.Steib@gmx.de>

   * man/gnus-faq.texi ([3.2]): Fix locating of environment variables in the
   Control Panel.

   * man/gnus.texi (Misc Article): Add index entry for
   gnus-single-article-buffer.

2007-06-27  Andreas Seltenreich  <andreas@gate450.dyndns.org>

   * man/gnus.texi (Starting Up): Fix typo.

2007-06-25  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Asynchronous Fetching): Fix typo.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-54

7 files changed, 68 insertions, 24 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0e9da63da1a..6ff604ab53f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,18 @@
+2007-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-summary-catchup): Don't recognize cached articles
+        as unfetched articles.
+
+2007-07-02  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-start.el (gnus-level-unsubscribed): Improve doc string.
+
+2007-06-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-article-summary-command-nosave)
+        (gnus-article-read-summary-keys): Don't set the 3rd arg of
+        pop-to-buffer for XEmacs.
+
 2007-06-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-agent.el (gnus-agent-fetch-headers)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 90af0740318..cbfa6bded93 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5607,7 +5607,7 @@ not have a face in `gnus-article-boring-faces'."
   "Execute the last keystroke in the summary buffer."
   (interactive)
   (let (func)
-    (pop-to-buffer gnus-article-current-summary nil 'norecord)
+    (pop-to-buffer gnus-article-current-summary nil (not (featurep 'xemacs)))
     (setq func (lookup-key (current-local-map) (this-command-keys)))
     (call-interactively func)))
 
@@ -5646,7 +5646,8 @@ not have a face in `gnus-article-boring-faces'."
             (member keys nosave-in-article))
         (let (func)
           (save-window-excursion
-            (pop-to-buffer gnus-article-current-summary nil 'norecord)
+            (pop-to-buffer gnus-article-current-summary
+                           nil (not (featurep 'xemacs)))
             ;; We disable the pick minor mode commands.
             (let (gnus-pick-mode)
               (setq func (lookup-key (current-local-map) keys))))
@@ -5658,14 +5659,16 @@ not have a face in `gnus-article-boring-faces'."
             (call-interactively func)
             (setq new-sum-point (point)))
           (when (member keys nosave-but-article)
-            (pop-to-buffer gnus-article-buffer nil 'norecord)))
+            (pop-to-buffer gnus-article-buffer
+                           nil (not (featurep 'xemacs)))))
       ;; These commands should restore window configuration.
       (let ((obuf (current-buffer))
             (owin (current-window-configuration))
             (opoint (point))
             win func in-buffer selected new-sum-start new-sum-hscroll)
         (cond (not-restore-window
-               (pop-to-buffer gnus-article-current-summary nil 'norecord))
+               (pop-to-buffer gnus-article-current-summary
+                              nil (not (featurep 'xemacs))))
               ((setq win (get-buffer-window gnus-article-current-summary))
                (select-window win))
               (t
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index d906cec6c6a..01b320e7186 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -178,8 +178,13 @@ properly with all servers."
 
 (defconst gnus-level-unsubscribed 7
   "Groups with levels less than or equal to this variable are unsubscribed.
-Groups with levels less than `gnus-level-subscribed', which should be
-less than this variable, are subscribed.")
+
+Groups with levels less than `gnus-level-subscribed', which
+should be less than this variable, are subscribed.  Groups with
+levels from `gnus-level-subscribed' (exclusive) upto this
+variable (inclusive) are unsubscribed.  See also
+`gnus-level-zombie', `gnus-level-killed' and the Info node `Group
+Levels' for details.")
 
 (defconst gnus-level-zombie 8
   "Groups with this level are zombie groups.")
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index b1b6c8b760b..56c5fffb7e5 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -10514,7 +10514,8 @@ The number of articles marked as read is returned."
                       (gnus-sorted-nunion
                        (gnus-sorted-intersection gnus-newsgroup-unreads
                                                  gnus-newsgroup-downloadable)
-                       gnus-newsgroup-unfetched)))
+                       (gnus-sorted-difference gnus-newsgroup-unfetched
+                                               gnus-newsgroup-cached))))
             ;; We actually mark all articles as canceled, which we
             ;; have to do when using auto-expiry or adaptive scoring.
             (gnus-summary-show-all-threads)
diff --git a/man/ChangeLog b/man/ChangeLog
index fcbeb4f03f8..131f02f5105 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,19 @@
+2007-07-02  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-faq.texi ([3.2]): Fix locating of environment variables in the
+        Control Panel.
+
+        * gnus.texi (Misc Article): Add index entry for
+        gnus-single-article-buffer.
+
+2007-06-27  Andreas Seltenreich  <andreas@gate450.dyndns.org>
+
+        * gnus.texi (Starting Up): Fix typo.
+
+2007-06-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Asynchronous Fetching): Fix typo.
+
 2007-06-24  Karl Berry  <karl@tug.org>
 
         * emacs.texi: new Back-Cover Text.
diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index 093cb4c289b..6bfb3477627 100644
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -427,12 +427,11 @@ SET HOME=C:\myhome
 @end example
 @noindent
 
-in your autoexec.bat and reboot.  Under NT, 2000 and XP,
-hit Winkey+Pause/Break to enter system options (if it
-doesn't work, go to Control Panel -> System). There you'll
-find the possibility to set environment variables, create
-a new one with name HOME and value C:\myhome, a reboot is
-not necessary.
+in your autoexec.bat and reboot.  Under NT, 2000 and XP, hit
+Winkey+Pause/Break to enter system options (if it doesn't work, go to
+Control Panel -> System -> Advanced). There you'll find the possibility
+to set environment variables.  Create a new one with name HOME and value
+C:\myhome.  Rebooting is not necessary.
 
 Now to create ~/.gnus.el, say
 @samp{C-x C-f ~/.gnus.el RET C-x C-s}.
diff --git a/man/gnus.texi b/man/gnus.texi
index 85167d53432..fe26aa5f662 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -947,8 +947,8 @@ Emacs for Heathens
 @chapter Starting Gnus
 @cindex starting up
 
-If you are haven't used Emacs much before using Gnus, read @ref{Emacs
-for Heathens} first.
+If you haven't used Emacs much before using Gnus, read @ref{Emacs for
+Heathens} first.
 
 @kindex M-x gnus
 @findex gnus
@@ -7173,12 +7173,12 @@ pre-fetch all the articles it can without bound.  If it is
 @code{nil}, no pre-fetching will be done.
 
 @vindex gnus-async-prefetch-article-p
-@findex gnus-async-read-p
+@findex gnus-async-unread-p
 There are probably some articles that you don't want to pre-fetch---read
 articles, for instance.  The @code{gnus-async-prefetch-article-p}
 variable controls whether an article is to be pre-fetched.  This
 function should return non-@code{nil} when the article in question is
-to be pre-fetched.  The default is @code{gnus-async-read-p}, which
+to be pre-fetched.  The default is @code{gnus-async-unread-p}, which
 returns @code{nil} on read articles.  The function is called with an
 article data structure as the only parameter.
 
@@ -11504,6 +11504,7 @@ region.
 
 @item gnus-single-article-buffer
 @vindex gnus-single-article-buffer
+@cindex article buffers, several
 If non-@code{nil}, use the same article buffer for all the groups.
 (This is the default.)  If @code{nil}, each group will have its own
 article buffer.
@@ -13509,14 +13510,18 @@ Header lines longer than the value of
 @code{nnmail-split-header-length-limit} are excluded from the split
 function.
 
-@vindex nnmail-mail-splitting-charset
 @vindex nnmail-mail-splitting-decodes
-By default, splitting @acronym{MIME}-decodes headers so you
-can match on non-@acronym{ASCII} strings.  The
-@code{nnmail-mail-splitting-charset} variable specifies the default
-charset for decoding.  The behavior can be turned off completely by
-binding @code{nnmail-mail-splitting-decodes} to @code{nil}, which is
-useful if you want to match articles based on the raw header data.
+@vindex nnmail-mail-splitting-charset
+By default, splitting does not decode headers, so you can not match on
+non-@acronym{ASCII} strings.  But it is useful if you want to match
+articles based on the raw header data.  To enable it, set the
+@code{nnmail-mail-splitting-decodes} variable to a non-@code{nil} value.
+In addition, the value of the @code{nnmail-mail-splitting-charset}
+variable is used for decoding non-@acronym{MIME} encoded string when
+@code{nnmail-mail-splitting-decodes} is non-@code{nil}.  The default
+value is @code{nil} which means not to decode non-@acronym{MIME} encoded
+string.  A suitable value for you will be @code{undecided} or be the
+charset used normally in mails you are interested in.
 
 @vindex nnmail-resplit-incoming
 By default, splitting is performed on all incoming messages.  If you