Revision: emacs@sv.gnu.org/emacs--devo--0--patch-203

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 78-80)

   - Update from CVS

4 files changed, 96 insertions, 50 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6f6e1507358..0e077ce0b04 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-06  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-fun.el (gnus): Require it for gnus-directory.
+
 2006-04-04  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
         * nnweb.el (nnweb-google-create-mapping): Update regexp.  Some
@@ -2143,6 +2147,10 @@
         * nnrss.el (nnrss-fetch): Signal an error if w3-parse-buffer also
         failed.
 
+2005-04-06  Joakim Verona  <joakim@verona.se>  (tiny change)
+
+        * nnrss.el (nnrss-read-group-data): Fix off-by-one error.
+
 2005-04-06  Jesper Harder  <harder@ifa.au.dk>
 
         * mm-util.el (mm-subst-char-in-string): Support inplace.
@@ -2153,9 +2161,8 @@
         (nnrss-request-delete-group): Use nnrss-make-filename.
         (nnrss-read-server-data): Use nnrss-make-filename; use load.
         (nnrss-save-server-data): Use nnrss-make-filename; use gnus-prin1.
-        (nnrss-read-group-data): Fix off-by-one error.  From Joakim Verona
-        <joakim@verona.se>; hash on description if link is missing; use
-        nnrss-make-filename; use load.
+        (nnrss-read-group-data): hash on description if link is missing;
+        use nnrss-make-filename; use load.
         (nnrss-save-group-data): Use nnrss-make-filename; use gnus-prin1.
         (nnrss-make-filename): New function.
         (nnrss-close): New function.
@@ -2304,11 +2311,10 @@
         * nnmaildir.el (nnmaildir-request-accept-article):
         Use `nnheader-cancel-timer' for compatibility with current XEmacs.
 
-2005-03-13  Steve Youngs  <steve@sxemacs.org>
+2005-03-13  Andrey Slusar  <anrays@gmail.com>  (tiny change)
 
         * gnus.el: Don't try and mark `gnus-agent-save-groups' as an
         autoloaded function.
-        From: Andrey Slusar <anrays@gmail.com>.
 
 2005-03-13  Steve Youngs  <steve@sxemacs.org>
 
@@ -2670,6 +2676,11 @@
         article buffer with a draft file.  This is a temporary measure
         against the 2004-08-22 change to gnus-article-edit-mode.
 
+2004-11-02  From Ilya N. Golubev  <gin@mo.msk.ru>.
+
+        * mm-util.el (mm-mime-mule-charset-alist): Add the windows-1251
+        entry.
+
 2004-11-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * html2text.el (html2text-get-attr): Remove unused argument `tag'.
@@ -2678,11 +2689,9 @@
         * mm-util.el (mm-enrich-utf-8-by-mule-ucs): Fix cleaning of
         after-load-alist.
 
-        * mm-util.el (mm-mime-mule-charset-alist): Add the windows-1251
-        entry.  From Ilya N. Golubev <gin@mo.msk.ru>.
-        (mm-enrich-utf-8-by-mule-ucs): New function run when Mule-UCS is
-        loaded under XEmacs.
-        (): Don't make duplicated entries in mm-mime-mule-charset-alist.
+        * mm-util.el (mm-enrich-utf-8-by-mule-ucs): New function run when
+        Mule-UCS is loaded under XEmacs.
+        (mm-mime-mule-charset-alist): Avoid duplicated entries.
 
         * mm-util.el (mm-coding-system-p): Return a coding-system.
         (mm-mime-mule-charset-alist): Use shift_jis instead of
@@ -3288,6 +3297,10 @@
 
         * mm-decode.el (mm-copy-to-buffer): Don't use set-buffer-multibyte.
 
+2004-09-26  Christian Neukirchen  <chneukirchen@yahoo.de>  (tiny change)
+
+        * mm-util.el (mm-image-load-path): Handle nil in load-path.
+
 2004-09-26  Jesper Harder  <harder@ifa.au.dk>
 
         * gnus-msg.el (gnus-post-news): Use blank Newsgroups line if
@@ -3317,9 +3330,6 @@
         * gnus-cache.el (gnus-cache-save-buffers): Check if buffer is
         alive.  Reported by Laurent Martelli <laurent@aopsys.com>.
 
-        * mm-util.el (mm-image-load-path): Handle nil in load-path.
-        From Christian Neukirchen <chneukirchen@yahoo.de>.
-
         * html2text.el (html2text-replace-list): Add &amp; and &apos;.
 
         * nnheader.el (nnheader-max-head-length): Increase to 8192.
@@ -3543,7 +3553,8 @@
 
         * gnus-sum.el (gnus-summary-insert-subject): Remove list identifiers.
 
-        From Hiroshi Fujishima <pooh@nature.tsukuba.ac.jp> (tiny change).
+2004-09-03  Hiroshi Fujishima <pooh@nature.tsukuba.ac.jp>  (tiny change)
+
         * spam-stat.el (spam-stat-reduce-size): Set spam-stat-dirty.
         (spam-stat-save): Accept prefix argument.
 
@@ -3566,7 +3577,7 @@
 
         * pgg-pgp.el (pgg-pgp-verify-region): Clean up.
 
-2004-05-19  Michael Schierl  <schierlm-usenet@gmx.de>
+2004-05-19  Michael Schierl  <schierlm-usenet@gmx.de>  (tiny change)
 
         * pgg-pgp.el (pgg-pgp-verify-region): Default when signature
         isn't a string.
@@ -3685,8 +3696,25 @@
 
         * gnus-agent.el (gnus-agent-restore-gcc): Use ^ and regexp-quote.
 
-        * gnus-sum.el (gnus-newsgroup-variables): Doc fix (tiny change).
-        From Helmut Waitzmann <Helmut.Waitzmann@web.de>.
+2004-08-30  Helmut Waitzmann  <Helmut.Waitzmann@web.de>  (tiny change)
+
+        * gnus-sum.el (gnus-newsgroup-variables): Doc fix.
+
+2004-08-26  YAGI Tatsuya <ynyaaa@ybb.ne.jp>  (tiny change)
+
+        * gnus-art.el (gnus-article-next-page): Fix the way to find a real
+        end-of-buffer.
+
+2004-08-26  Stefan Wiens <s.wi@gmx.net>  (tiny change)
+
+        * gnus-sum.el (gnus-read-header): Don't remove a header for the
+        parent article of a sparse article in the thread hashtb.
+
+2004-08-26  David Hedbor <dhedbor@real.com>  (tiny change)
+
+        * nnmail.el (nnmail-split-lowercase-expanded): New user option.
+        (nnmail-expand-newtext): Lowercase expanded entries if
+        nnmail-split-lowercase-expanded is non-nil.
 
         * gnus-agent.el (gnus-agent-regenerate-group): Activate the group
         when the group's active is not available.
@@ -3694,8 +3722,6 @@
         * gnus-art.el (article-hide-headers): Refer to the values for
         gnus-ignored-headers and gnus-visible-headers in the summary
         buffer since a user may have set them as group parameters.
-        (gnus-article-next-page): Fix the way to find a real end-of-buffer
-        (tiny change).  From YAGI Tatsuya <ynyaaa@ybb.ne.jp>.
         (gnus-article-read-summary-keys): Restore new window-start and
         hscroll to summary window.
         (gnus-prev-page-map): Remove duplicated one.
@@ -3724,10 +3750,6 @@
         * gnus-spec.el (gnus-update-format): Replace pp-to-string with
         gnus-pp-to-string.
 
-        * gnus-sum.el (gnus-read-header): Don't remove a header for the
-        parent article of a sparse article in the thread hashtb.
-        From Stefan Wiens <s.wi@gmx.net>.
-
         * gnus-util.el (gnus-bind-print-variables): New macro.
         (gnus-prin1): Use it.
         (gnus-prin1-to-string): Use it.
@@ -3767,11 +3789,6 @@
         (nndoc-rfc822-forward-generate-article): New function.
         (nndoc-rfc822-forward-generate-head): New function.
 
-        From David Hedbor <dhedbor@real.com>.
-        * nnmail.el (nnmail-split-lowercase-expanded): New user option.
-        (nnmail-expand-newtext): Lowercase expanded entries if
-        nnmail-split-lowercase-expanded is non-nil.
-
         * score-mode.el (gnus-score-pretty-print): Replace pp with gnus-pp.
 
         * webmail.el (webmail-debug): Replace pp with gnus-pp.
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index e1655e91945..4eb5cdd1c99 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -32,6 +32,7 @@
 (require 'mm-util)
 (require 'gnus-ems)
 (require 'gnus-util)
+(require 'gnus)
 
 (defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory)
   "*Directory where X-Face PBM files are stored."
diff --git a/man/ChangeLog b/man/ChangeLog
index 4e3e6cda228..8bddc6c1c9f 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,21 @@
+2006-04-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Summary Buffer Lines): Add `*'.
+
+2006-04-07  Jochen K,A|(Bpper  <jochen@fhi-berlin.mpg.de>
+
+        * gnus.texi (Group Parameters): Mention
+        gnus-permanently-visible-groups.
+
+2006-04-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Face): Fix typo.
+
+2006-04-05  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (X-Face): Clarify.
+        (Face): Need Emacs with PNG support.
+
 2006-04-08  Kevin Ryde  <user42@zip.com.au>
 
         * text.texi (Fill Commands): fill-nobreak-predicate is now a hook.
diff --git a/man/gnus.texi b/man/gnus.texi
index 0c848478b60..6493911afcf 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -2758,6 +2758,9 @@ If the group parameter list has the element @code{(visible . t)},
 that group will always be visible in the Group buffer, regardless
 of whether it has any unread articles.
 
+This parameter cannot be set via @code{gnus-parameters}. See
+@code{gnus-permanently-visible-groups} as an alternative.
+
 @item broken-reply-to
 @cindex broken-reply-to
 Elements like @code{(broken-reply-to . t)} signals that @code{Reply-To}
@@ -3035,8 +3038,9 @@ parameters (@pxref{Topic Parameters}).
 
 @vindex gnus-parameters
 Group parameters can be set via the @code{gnus-parameters} variable too.
-But some variables, such as @code{visible}, have no effect.  For
-example:
+But some variables, such as @code{visible}, have no effect (For this
+case see @code{gnus-permanently-visible-groups} as an alternative.).
+For example:
 
 @lisp
 (setq gnus-parameters
@@ -4675,6 +4679,8 @@ article has any children.
 The line number.
 @item O
 Download mark.
+@item *
+Desired cursor position (instead of after first colon).
 @item &user-date;
 Age sensitive date format.  Various date format is defined in
 @code{gnus-user-date-format-alist}.
@@ -22073,10 +22079,20 @@ readers.
 @end iftex
 @c @anchor{X-Face}
 
-Decoding an @code{X-Face} header either requires an Emacs that has
+Viewing an @code{X-Face} header either requires an Emacs that has
 @samp{compface} support (which most XEmacs versions has), or that you
-have @samp{compface} installed on your system.  If either is true,
-Gnus will default to displaying @code{X-Face} headers.
+have suitable conversion or display programs installed.  If your Emacs
+has image support the default action is to display the face before the
+@code{From} header.  If there's no native @code{X-Face} support, Gnus
+will try to convert the @code{X-Face} header using external programs
+from the @code{pbmplus} package and friends.  For XEmacs it's faster if
+XEmacs has been compiled with @code{X-Face} support.  The default action
+under Emacs without image support is to fork off the @code{display}
+program.
+
+On a GNU/Linux system, the @code{display} program is from the
+ImageMagick package.  For external conversion programs look for packages
+with names like @code{netpbm}, @code{libgr-progs} and @code{compface}.
 
 The variable that controls this is the
 @code{gnus-article-x-face-command} variable.  If this variable is a
@@ -22085,21 +22101,6 @@ function, this function will be called with the face as the argument.
 If the @code{gnus-article-x-face-too-ugly} (which is a regexp) matches
 the @code{From} header, the face will not be shown.
 
-The default action under Emacs without image support is to fork off the
-@code{display} program@footnote{@code{display} is from the ImageMagick
-package.  For the @code{uncompface} and @code{icontopbm} programs look
-for a package like @code{compface} or @code{faces-xface} on a GNU/Linux
-system.} to view the face.
-
-Under XEmacs or Emacs 21+ with suitable image support, the default
-action is to display the face before the @code{From} header.  (It's
-nicer if XEmacs has been compiled with @code{X-Face} support---that
-will make display somewhat faster.  If there's no native @code{X-Face}
-support, Gnus will try to convert the @code{X-Face} header using
-external programs from the @code{pbmplus} package and
-friends.@footnote{On a GNU/Linux system look for packages with names
-like @code{netpbm}, @code{libgr-progs} and @code{compface}.})
-
 (Note: @code{x-face} is used in the variable/function names, not
 @code{xface}).
 
@@ -22117,7 +22118,9 @@ default colors are black and white.
 If you use posting styles, you can use an @code{x-face-file} entry in
 @code{gnus-posting-styles}, @xref{Posting Styles}.  If you don't, Gnus
 provides a few convenience functions and variables to allow easier
-insertion of X-Face headers in outgoing messages.
+insertion of X-Face headers in outgoing messages.  You also need the
+above mentioned ImageMagick, netpbm or other image conversion packages
+(depending the values of the variables below) for these functions.
 
 @findex gnus-random-x-face
 @vindex gnus-convert-pbm-to-x-face-command
@@ -22164,7 +22167,7 @@ Using the last function would be something like this:
 @subsection Face
 @cindex face
 
-@c #### FIXME: faces and x-faces'implementations should really be harmonized.
+@c #### FIXME: faces and x-faces' implementations should really be harmonized.
 
 @code{Face} headers are essentially a funkier version of @code{X-Face}
 ones. They describe a 48x48 pixel colored image that's supposed to
@@ -22176,6 +22179,13 @@ The contents of a @code{Face} header must be a base64 encoded PNG image.
 See @uref{http://quimby.gnus.org/circus/face/} for the precise
 specifications.
 
+Viewing an @code{Face} header requires an Emacs that is able to display
+PNG images.
+@c Maybe add this:
+@c (if (featurep 'xemacs)
+@c     (featurep 'png)
+@c   (image-type-available-p 'png))
+
 Gnus provides a few convenience functions and variables to allow
 easier insertion of Face headers in outgoing messages.