Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 266-268)

   - Merge from emacs--rel--22
   - Update from CVS

2007-11-01  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/mm-util.el (mm-charset-eval-alist): Mark as risky local variable.

   * lisp/gnus/gnus.el (gnus-group-charter-alist): Mark as risky local variable.

   * lisp/gnus/gnus-art.el (gnus-button-alist, gnus-header-button-alist): Mark as
   risky local variable.

   * lisp/gnus/gnus-group.el (gnus-group-icon-list): Mark as risky local variable.

2007-11-01  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)

   * lisp/gnus/message.el (message-use-alternative-email-as-from): Examine the
   From header as well; use message-make-from in order to include a
   user's full name.  [ Backported bug fix from No Gnus. ]

2007-10-30  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/qp.el (quoted-printable-decode-string): Fix typo in doc string.

2007-10-30  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-ems.el (gnus-x-splash): Work even if there's no scroll bar.

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

8 files changed, 37 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 88cc5e07d39..5df07f75355 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,28 @@
+2007-11-01  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * mm-util.el (mm-charset-eval-alist): Mark as risky local variable.
+
+        * gnus.el (gnus-group-charter-alist): Mark as risky local variable.
+
+        * gnus-art.el (gnus-button-alist, gnus-header-button-alist): Mark as
+        risky local variable.
+
+        * gnus-group.el (gnus-group-icon-list): Mark as risky local variable.
+
+2007-11-01  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)
+
+        * message.el (message-use-alternative-email-as-from): Examine the
+        From header as well; use message-make-from in order to include a
+        user's full name.  [ Backported bug fix from No Gnus. ]
+
+2007-10-30  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * qp.el (quoted-printable-decode-string): Fix typo in doc string.
+
+2007-10-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-ems.el (gnus-x-splash): Work even if there's no scroll bar.
+
 2007-10-23  Richard Stallman  <rms@gnu.org>
 
         * gnus-group.el (gnus-group-highlight): Mark as risky.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 696222e0043..1ab31bb519f 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6708,6 +6708,7 @@ variable it the real callback function."
                        (repeat :tag "Par"
                                :inline t
                                (integer :tag "Regexp group")))))
+(put 'gnus-button-alist 'risky-local-variable t)
 
 (defcustom gnus-header-button-alist
   '(("^\\(References\\|Message-I[Dd]\\|^In-Reply-To\\):" "<[^<>]+>"
@@ -6745,6 +6746,7 @@ HEADER is a regexp to match a header.  For a fuller explanation, see
                        (repeat :tag "Par"
                                :inline t
                                (integer :tag "Regexp group")))))
+(put 'gnus-header-button-alist 'risky-local-variable t)
 
 ;;; Commands:
 
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index 88190b8085b..a4d24603b4c 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -208,7 +208,9 @@
              (setq sbars
                    (cons (/ (or (frame-parameter nil 'scroll-bar-width) 14)
                             fcw)
-                         0))))
+                         0)))
+            (t
+             (setq sbars '(0 . 0))))
       (setq left (- (* (round (/ (1- (/ (+ (window-width)
                                            (car sbars) (cdr sbars)
                                            (/ (+ (or (car fringes) 0)
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 3c5cd7bedef..e92f463a846 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -416,6 +416,7 @@ score: The score of the group.
 ticked: The number of ticked articles."
   :group 'gnus-group-icons
   :type '(repeat (cons (sexp :tag "Form") file)))
+(put 'gnus-group-icon-list 'risky-local-variable t)
 
 (defcustom gnus-group-name-charset-method-alist nil
   "Alist of method and the charset for group names.
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 6fe8b1c3cbe..663a417c283 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1466,6 +1466,7 @@ When FORM is evaluated `name' is bound to the name of the group."
   :version "22.1"
   :group 'gnus-group-various
   :type '(repeat (cons (string :tag "Hierarchy") (sexp :tag "Form"))))
+(put 'gnus-group-charter-alist 'risky-local-variable t)
 
 (defcustom gnus-group-fetch-control-use-browse-url nil
   "*Non-nil means that control messages are displayed using `browse-url'.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 419fd07727c..8b282dacc96 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7164,7 +7164,7 @@ regexp VARSTR."
 address in `message-alternative-emails', looking at To, Cc and
 From headers in the original article."
   (require 'mail-utils)
-  (let* ((fields '("To" "Cc"))
+  (let* ((fields '("To" "Cc" "From"))
          (emails
           (split-string
            (mail-strip-quoted-names
@@ -7179,7 +7179,8 @@ From headers in the original article."
     (unless (or (not email) (equal email user-mail-address))
       (message-remove-header "From")
       (goto-char (point-max))
-      (insert "From: " email "\n"))))
+      (insert "From: " (let ((user-mail-address email)) (message-make-from))
+              "\n"))))
 
 (defun message-options-get (symbol)
   (cdr (assq symbol message-options)))
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 04a600abf25..4f41cf3645b 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -420,6 +420,7 @@ could use `autoload-coding-system' here."
                        (cons (symbol :tag "charset")
                              (symbol :tag "form"))))
   :group 'mime)
+(put 'mm-charset-eval-alist 'risky-local-variable t)
 
 (defvar mm-binary-coding-system
   (cond
diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el
index 17cc7ef2cf6..cb9c779e4b5 100644
--- a/lisp/gnus/qp.el
+++ b/lisp/gnus/qp.el
@@ -82,7 +82,7 @@ them into characters should be done separately."
 
 (defun quoted-printable-decode-string (string &optional coding-system)
   "Decode the quoted-printable encoded STRING and return the result.
-If CODING-SYSTEM is non-nil, decode the region with coding-system.
+If CODING-SYSTEM is non-nil, decode the string with coding-system.
 Use of CODING-SYSTEM is deprecated; this function should deal with
 raw bytes, and coding conversion should be done separately."
   (mm-with-unibyte-buffer