Mercurial > emacs
changeset 85888:ff86fe6b4194
Merge from gnus--devo--0
Patches applied:
* gnus--devo--0 (patch 404-406)
- Merge from gnus--rel--5.10
- Update from CVS
* gnus--rel--5.10 (patch 266)
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-919
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 02 Nov 2007 01:38:49 +0000 |
| parents | a3b1d55c8ddb |
| children | 683a6a9e56ab |
| files | lisp/gnus/ChangeLog lisp/gnus/encrypt.el 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 |
| diffstat | 8 files changed, 58 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu Nov 01 18:29:09 2007 +0000 +++ b/lisp/gnus/ChangeLog Fri Nov 02 01:38:49 2007 +0000 @@ -1,6 +1,34 @@ +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 Teodor Zlatanov <tzz@lifelogs.com> + + * encrypt.el: Improve documentation to fix function name typo. + Reported by Daiki Ueno <ueno@unixuser.org>. + +2007-11-01 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-art.el (gnus-article-next-page): Honor gnus-article-over-scroll + even if the point is not in the last page of an article. + (gnus-article-prev-page): Honor gnus-article-over-scroll when moving + back to the previous page. + +2007-10-30 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-ems.el (gnus-x-splash): Work even if there's no scroll bar. + 2007-10-29 Stefan Monnier <monnier@iro.umontreal.ca> - * message.el (message-check-news-body-syntax): Avoid mm-string-as-multibyte. + * message.el (message-check-news-body-syntax): Avoid + mm-string-as-multibyte. (message-hide-headers): Don't assume (point-min)==1. 2007-10-28 Reiner Steib <Reiner.Steib@gmx.de> @@ -1319,6 +1347,7 @@ * message.el (message-cite-original-1): Call gnus-article-highlight-citation if requested. + (message-make-from): Allow name and address as optional arguments. * gnus-cite.el (gnus-article-highlight-citation): Add SAME-BUFFER arg.
--- a/lisp/gnus/encrypt.el Thu Nov 01 18:29:09 2007 +0000 +++ b/lisp/gnus/encrypt.el Fri Nov 02 01:38:49 2007 +0000 @@ -43,7 +43,7 @@ ;;; C-x C-f ~/.authinfo ;;; 2) write the new authinfo.enc -;;; M-x encrypt-file-contents ~/.authinfo.enc +;;; M-x encrypt-write-file-contents RET ~/.authinfo.enc ;;; 3) verify the new authinfo is correct (this will show the contents in the minibuffer) ;;; M-: (encrypt-get-file-contents "~/.authinfo.enc")
--- a/lisp/gnus/gnus-art.el Thu Nov 01 18:29:09 2007 +0000 +++ b/lisp/gnus/gnus-art.el Fri Nov 02 01:38:49 2007 +0000 @@ -5893,10 +5893,16 @@ Argument LINES specifies lines to be scrolled up." (interactive "p") (move-to-window-line -1) - (if (save-excursion - (end-of-line) - (and (pos-visible-in-window-p) ;Not continuation line. - (>= (1+ (point)) (point-max)))) ;Allow for trailing newline. + (if (and (not (and gnus-article-over-scroll + (> (count-lines (window-start) (point-max)) + (+ (or lines (1- (window-height))) + (or (and (boundp 'scroll-margin) + (symbol-value 'scroll-margin)) + 0))))) + (save-excursion + (end-of-line) + (and (pos-visible-in-window-p) ;Not continuation line. + (>= (1+ (point)) (point-max))))) ;Allow for trailing newline. ;; Nothing in this page. (if (or (not gnus-page-broken) (save-excursion @@ -5956,7 +5962,14 @@ (progn (gnus-narrow-to-page -1) ;Go to previous page. (goto-char (point-max)) - (recenter -1)) + (recenter (if gnus-article-over-scroll + (if lines + (max (+ lines (or (and (boundp 'scroll-margin) + (symbol-value 'scroll-margin)) + 0)) + 3) + (- (window-height) 2)) + -1))) (prog1 (condition-case () (let ((scroll-in-place nil)) @@ -7181,6 +7194,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\\):" "<[^<>]+>" @@ -7220,6 +7234,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 18:29:09 2007 +0000 +++ b/lisp/gnus/gnus-ems.el Fri Nov 02 01:38:49 2007 +0000 @@ -200,7 +200,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 18:29:09 2007 +0000 +++ b/lisp/gnus/gnus-group.el Fri Nov 02 01:38:49 2007 +0000 @@ -420,6 +420,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 18:29:09 2007 +0000 +++ b/lisp/gnus/gnus.el Fri Nov 02 01:38:49 2007 +0000 @@ -1480,6 +1480,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 18:29:09 2007 +0000 +++ b/lisp/gnus/message.el Fri Nov 02 01:38:49 2007 +0000 @@ -5346,7 +5346,7 @@ (concat message-user-path "!" login-name)) (t login-name)))) -(defun message-make-from (&optional name address ) +(defun message-make-from (&optional name address) "Make a From header." (let* ((style message-from-style) (login (or address (message-make-address)))