Synch to No Gnus 200510200215.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 900cdc3..cd53195 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,11 @@
 
 2005-10-19  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * gnus-art.el (gnus-treat-strip-trailing-blank-lines)
+       (gnus-treat-strip-leading-blank-lines): Improve doc string.
+
+       * message.el (message-tool-bar-local-item-from-menu): Fix comment.
+
        * mm-bodies.el (mm-decode-string): Call
        `mm-charset-to-coding-system' with allow-override argument.
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index e83033f..4a953c0 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1248,7 +1248,10 @@ See Info node `(gnus)Customizing Articles' for details."
 (defcustom gnus-treat-strip-trailing-blank-lines nil
   "Strip trailing blank lines.
 Valid values are nil, t, `head', `last', an integer or a predicate.
-See Info node `(gnus)Customizing Articles' for details."
+See Info node `(gnus)Customizing Articles' for details.
+
+When set to t, it also strips trailing blanks in all MIME parts.
+Consider to use `last' instead."
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
@@ -1256,7 +1259,9 @@ See Info node `(gnus)Customizing Articles' for details."
 (defcustom gnus-treat-strip-leading-blank-lines nil
   "Strip leading blank lines.
 Valid values are nil, t, `head', `last', an integer or a predicate.
-See Info node `(gnus)Customizing Articles' for details."
+See Info node `(gnus)Customizing Articles' for details.
+
+When set to t, it also strips trailing blanks in all MIME parts."
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)

diff --git a/lisp/message.el b/lisp/message.el
index 9f2d7b3..3d1c711 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7404,9 +7404,8 @@ which specify the range to operate on."
 
 (defun message-tool-bar-local-item-from-menu (command icon in-map &optional from-map &rest props)
   ;; We need to make tool bar entries in local keymaps with
-  ;; `tool-bar-local-item-from-menu' in Emacs > 21.3
+  ;; `tool-bar-local-item-from-menu' in Emacs >= 22
   (if (fboundp 'tool-bar-local-item-from-menu)
-      ;; This is for Emacs 21.3
       (tool-bar-local-item-from-menu command icon in-map from-map props)
     (tool-bar-add-item-from-menu command icon from-map props)))