Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 146-152)

   - Update from CVS

2006-10-13  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * lisp/mm-uu.el (mm-uu-pgp-signed-extract-1): Use RFC 2440 definition of
   "blank line" when searching for end of armor headers.

2006-10-13  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * texi/gnus.texi (Other modes): Fix typo. Add alternative index entry for
   gnus-dired-attach.
   (Selecting a Group): Fix typo.

2006-10-06  Reiner Steib  <Reiner.Steib@gmx.de>

   * texi/gnus.texi (Image Enhancements): Update for Emacs 22.

   * texi/gnus-faq.texi ([1.3]): Update.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18a015a..eb8fe20 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-13  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * mm-uu.el (mm-uu-pgp-signed-extract-1): Use RFC 2440 definition of
+       "blank line" when searching for end of armor headers.
+
 2006-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gmm-utils.el (gmm-write-region): Fix variable name.

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index d3e59ea..7addf5c 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -324,7 +324,7 @@ Also, drop all gnus-registry-ignored-groups matches."
       (setq alist
            (nthcdr
             trim-length
-            (sort alist 
+            (sort alist
                   (lambda (a b)
                     (time-less-p
                      (or (cdr (gethash (car a) timehash)) '(0 0 0))

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 0a70520..2a1fa44 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -1119,8 +1119,9 @@ If SUFFIX is non-nil, add that at the end of the file name."
                             (setq file (concat file suffix)))
                         (if dir-flag
                             (make-directory file)
-                          ;; NOTE: This is unsafe if XEmacs users don't use a
-                          ;; secure temp directory.
+                          ;; NOTE: This is unsafe if Emacs 20
+                          ;; users and XEmacs users don't use
+                          ;; a secure temp directory.
                           (gmm-write-region "" nil file nil 'silent
                                             nil 'excl))
                         nil)

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index acbba05..758b79a 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -482,7 +482,7 @@ apply the face `mm-uu-extract'."
           mm-security-handle 'gnus-details
           (format "Clear verification not supported by `%s'.\n" mml2015-use))))
       (goto-char (point-min))
-      (if (search-forward "\n\n" nil t)
+      (if (re-search-forward "\n[\t ]*\n" nil t)
          (delete-region (point-min) (point)))
       (if (re-search-forward mm-uu-pgp-beginning-signature nil t)
          (delete-region (match-beginning 0) (point-max)))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 738b425..044f36f 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,15 @@
+2006-10-13  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * gnus.texi (Other modes): Fix typo.  Add alternative index entry for
+       gnus-dired-attach.
+       (Selecting a Group): Fix typo.
+
+2006-10-06  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (Image Enhancements): Update for Emacs 22.
+
+       * gnus-faq.texi ([1.3]): Update.
+
 2006-10-02  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus.texi (Foreign Groups): Say where change of editing commands are

diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index e94036d..861bab4 100644 (file)
--- a/texi/gnus-faq.texi
+++ b/texi/gnus-faq.texi
@@ -172,13 +172,14 @@ Where and how to get Gnus?
 
 @subsubheading Answer
 
-The latest released version of Gnus isn't included in
-Emacs 21, therefor you should get the Gnus tarball from
-@uref{http://www.gnus.org/dist/gnus.tar.gz}
-or via anonymous FTP from 
+Gnus is released independent from releases of Emacs and XEmacs.
+Therefore, the version bundled with Emacs or the version in XEmacs'
+package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs
+20 is outdated).
+@c
+You can get the latest released version of Gnus from
+@uref{http://www.gnus.org/dist/gnus.tar.gz} or via anonymous FTP from
 @uref{ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz}.
-If you use XEmacs instead of Emacs you can use XEmacs'
-package system instead.
 
 @node [1.4]
 @subsubheading Question 1.4

diff --git a/texi/gnus.texi b/texi/gnus.texi
index fc29121..62bf911 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -2168,7 +2168,7 @@ If @code{gnus-auto-select-first} is non-@code{nil}, select an article
 automatically when entering a group with the @kbd{SPACE} command.
 Which article this is is controlled by the
 @code{gnus-auto-select-subject} variable.  Valid values for this
-variable is:
+variable are:
 
 @table @code
 
@@ -22669,8 +22669,8 @@ It takes the group name as a parameter.
 @section Image Enhancements
 
 XEmacs, as well as Emacs 21@footnote{Emacs 21 on MS Windows doesn't
-support images yet.}, is able to display pictures and stuff, so Gnus has
-taken advantage of that.
+support images, Emacs 22 does.} and up, are able to display pictures and
+stuff, so Gnus has taken advantage of that.
 
 @menu
 * X-Face::                      Display a funky, teensy black-and-white image.
@@ -25137,7 +25137,7 @@ Save table: (spam-stat-save)
 @subsection Dired
 @cindex dired
 
-@code{gnus-dired-minor-mode} provided some useful functions for dired
+@code{gnus-dired-minor-mode} provides some useful functions for dired
 buffers.  It is enabled with
 @lisp
 (add-hook 'dired-mode-hook 'turn-on-gnus-dired-mode)
@@ -25146,6 +25146,7 @@ buffers.  It is enabled with
 @table @kbd
 @item C-c C-m C-a
 @findex gnus-dired-attach
+@cindex attachments, selection via dired
 Send dired's marked files as an attachment (@code{gnus-dired-attach}).
 You will be prompted for a message buffer.