Mercurial > emacs
changeset 79313:f4c90d55f00f
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 02 Nov 2007 01:39:46 +0000 |
| parents | 6040bcb0c2ea |
| children | 2a7f5d50fe6f |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-art.el lisp/gnus/gnus-ems.el lisp/gnus/gnus-group.el lisp/gnus/gnus.el lisp/gnus/message.el lisp/gnus/mm-util.el lisp/gnus/qp.el |
| diffstat | 8 files changed, 37 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu Nov 01 08:12:58 2007 +0000 +++ b/lisp/gnus/ChangeLog Fri Nov 02 01:39:46 2007 +0000 @@ -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.
--- a/lisp/gnus/gnus-art.el Thu Nov 01 08:12:58 2007 +0000 +++ b/lisp/gnus/gnus-art.el Fri Nov 02 01:39:46 2007 +0000 @@ -6708,6 +6708,7 @@ (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 @@ (repeat :tag "Par" :inline t (integer :tag "Regexp group"))))) +(put 'gnus-header-button-alist 'risky-local-variable t) ;;; Commands:
--- a/lisp/gnus/gnus-ems.el Thu Nov 01 08:12:58 2007 +0000 +++ b/lisp/gnus/gnus-ems.el Fri Nov 02 01:39:46 2007 +0000 @@ -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)
--- a/lisp/gnus/gnus-group.el Thu Nov 01 08:12:58 2007 +0000 +++ b/lisp/gnus/gnus-group.el Fri Nov 02 01:39:46 2007 +0000 @@ -416,6 +416,7 @@ 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.
--- a/lisp/gnus/gnus.el Thu Nov 01 08:12:58 2007 +0000 +++ b/lisp/gnus/gnus.el Fri Nov 02 01:39:46 2007 +0000 @@ -1466,6 +1466,7 @@ :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'.
--- a/lisp/gnus/message.el Thu Nov 01 08:12:58 2007 +0000 +++ b/lisp/gnus/message.el Fri Nov 02 01:39:46 2007 +0000 @@ -7164,7 +7164,7 @@ 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 @@ (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)))
--- a/lisp/gnus/mm-util.el Thu Nov 01 08:12:58 2007 +0000 +++ b/lisp/gnus/mm-util.el Fri Nov 02 01:39:46 2007 +0000 @@ -420,6 +420,7 @@ (cons (symbol :tag "charset") (symbol :tag "form")))) :group 'mime) +(put 'mm-charset-eval-alist 'risky-local-variable t) (defvar mm-binary-coding-system (cond
--- a/lisp/gnus/qp.el Thu Nov 01 08:12:58 2007 +0000 +++ b/lisp/gnus/qp.el Fri Nov 02 01:39:46 2007 +0000 @@ -82,7 +82,7 @@ (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