Merge from gnus--rel--5.10

Patches applied:

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

   - Update from CVS

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

   * lisp/gnus/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>

   * lisp/gnus/gmm-utils.el (gmm-write-region): Fix variable name.

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

   * lisp/gnus/gmm-utils.el (gmm-write-region): New function based on compatibility
   code from `mm-make-temp-file'.

   * lisp/gnus/mm-util.el (mm-make-temp-file): Use `gmm-write-region'.

   * lisp/gnus/nnmaildir.el (nnmaildir--update-nov)
   (nnmaildir-request-replace-article, nnmaildir-request-accept-article):
   Use `gmm-write-region'.

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

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

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

7 files changed, 56 insertions, 19 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 63e7f43424d..dba2c407b21 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,23 @@
+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.
+
+2006-10-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gmm-utils.el (gmm-write-region): New function based on compatibility
+        code from `mm-make-temp-file'.
+
+        * mm-util.el (mm-make-temp-file): Use `gmm-write-region'.
+
+        * nnmaildir.el (nnmaildir--update-nov)
+        (nnmaildir-request-replace-article, nnmaildir-request-accept-article):
+        Use `gmm-write-region'.
+
 2006-10-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-sum.el (gnus-summary-make-menu-bar): Clarify
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index e773aa3bfac..59d02927008 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -401,6 +401,21 @@ If mode is nil, use `major-mode' of the curent buffer."
                  (string-match "^\\(.+\\)-mode$" mode)
                  (match-string 1 mode))))))
 
+(defun gmm-write-region (start end filename &optional append visit
+                               lockname mustbenew)
+  "Compatibility function for `write-region'.
+
+In XEmacs, the seventh argument of `write-region' specifies the
+coding-system."
+  (if (and mustbenew
+           (or (featurep 'xemacs)
+               (= emacs-major-version 20)))
+      (if (file-exists-p filename)
+          (signal 'file-already-exists
+                  (list "File exists" filename))
+        (write-region start end filename append visit lockname))
+    (write-region start end filename append visit lockname mustbenew)))
+
 (provide 'gmm-utils)
 
 ;; arch-tag: e0b60920-2ce6-40c1-bfc0-cadbbe26b602
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 1c9f9749f85..e75f2ef6d5f 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1126,17 +1126,11 @@ 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)
-                           (if (or (featurep 'xemacs)
-                                   (= emacs-major-version 20))
-                               ;; NOTE: This is unsafe if Emacs 20
-                               ;; users and XEmacs users don't use
-                               ;; a secure temp directory.
-                               (if (file-exists-p file)
-                                   (signal 'file-already-exists
-                                           (list "File exists" file))
-                                 (write-region "" nil file nil 'silent))
-                             (write-region "" nil file nil 'silent
-                                           nil 'excl)))
+                           ;; 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)
                      (file-already-exists t)
                      ;; The Emacs 20 and XEmacs versions of
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 9d9d87a3670..b1ed0b7af4e 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -373,7 +373,7 @@ Return that buffer."
            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/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index 6024b992061..589c4da8caf 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -428,7 +428,8 @@ by nnmaildir-request-article.")
         (prin1 (vector storage-version num msgid nov) (current-buffer))
         (setq file (concat novfile ":"))
         (nnmaildir--unlink file)
-        (write-region (point-min) (point-max) file nil 'no-message nil 'excl))
+        (gmm-write-region (point-min) (point-max) file nil 'no-message nil
+                          'excl))
       (rename-file file novfile 'replace)
       (setf (nnmaildir--art-msgid article) msgid)
       nov)))
@@ -1246,8 +1247,8 @@ by nnmaildir-request-article.")
         (throw 'return nil))
       (save-excursion
         (set-buffer buffer)
-        (write-region (point-min) (point-max) tmpfile nil 'no-message nil
-                      'excl))
+        (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
+                          'excl))
       (unix-sync) ;; no fsync :(
       (rename-file tmpfile (concat (nnmaildir--cur dir) file suffix) 'replace)
       t)))
@@ -1341,8 +1342,8 @@ by nnmaildir-request-article.")
       (condition-case nil
           (add-name-to-file nnmaildir--file tmpfile)
         (error
-         (write-region (point-min) (point-max) tmpfile nil 'no-message nil
-                       'excl)
+         (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
+                           'excl)
          (unix-sync))) ;; no fsync :(
       (nnheader-cancel-timer 24h)
       (condition-case err
diff --git a/man/ChangeLog b/man/ChangeLog
index 8542e0c6067..4eb3f6b0018 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+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-12  Roberto Rodr,Am(Bguez  <lanubeblanca@googlemail.com>
 
         * widget.texi: Fix typos (tiny change)
diff --git a/man/gnus.texi b/man/gnus.texi
index 86f52fded7b..a929bb2b208 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -2139,7 +2139,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
 
@@ -24471,7 +24471,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)
@@ -24480,6 +24480,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.