mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

Merge from gnus--devo--0

Browse Source 
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
This commit is contained in:
Miles Bader 2007-11-02 01:38:49 +00:00
parent 209dc81c15
commit 60ece9b00d
8 changed files with 58 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lisp/gnus/ChangeLog
View File

@ -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.

2
lisp/gnus/encrypt.el
View File

@ -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")

25
lisp/gnus/gnus-art.el
View File

@ -5893,10 +5893,16 @@ If end of article, return non-nil. Otherwise return nil.
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 @@ Argument LINES specifies lines to be scrolled down."
(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 @@ 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\\):" "<[^<>]+>"
@ -7220,6 +7234,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:

4
lisp/gnus/gnus-ems.el
View File

@ -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)

1
lisp/gnus/gnus-group.el
View File

@ -420,6 +420,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.

1
lisp/gnus/gnus.el
View File

@ -1480,6 +1480,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'.

2
lisp/gnus/message.el
View File

@ -5346,7 +5346,7 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
(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)))

1
lisp/gnus/mm-util.el
View File

@ -425,6 +425,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