Commit e4a0f843 authored by Miles Bader's avatar Miles Bader
Browse files

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

2007-10-23  Katsumi Yamaoka  <>

   * lisp/gnus/gnus.el (gnus-server-to-method): Return method found first in

2007-10-20  Reiner Steib  <>

   * lisp/gnus/html2text.el (html2text-fix-paragraph): Use `forward-line' instead of

parent b6ff295c
......@@ -2,6 +2,16 @@
* gnus-group.el (gnus-group-highlight): Mark as risky.
2007-10-23 Katsumi Yamaoka <>
* gnus.el (gnus-server-to-method): Return method found first in
2007-10-20 Reiner Steib <>
* html2text.el (html2text-fix-paragraph): Use `forward-line' instead of
2007-10-18 Katsumi Yamaoka <>
* nnmail.el (nnmail-fancy-expiry-target): Use rmail-dont-reply-to to
......@@ -3518,15 +3518,14 @@ that that variable is buffer-local to the summary buffers."
;; of every method. As a side-effect, loads the
;; gnus-server-method-cache so this only happens once,
;; if at all.
(let (match)
(lambda (info)
(let ((info-method (gnus-info-method info)))
(unless (stringp info-method)
(let ((info-server (gnus-method-to-server info-method)))
(when (equal server info-server)
(setq match info-method))))))
(cdr gnus-newsrc-alist))
(let ((alist (cdr gnus-newsrc-alist))
method match)
(while alist
(setq method (gnus-info-method (pop alist)))
(when (and (not (stringp method))
(equal server (gnus-method-to-server method)))
(setq match method
alist nil)))
(when result
(push (cons server result) gnus-server-method-cache))
......@@ -352,7 +352,7 @@ formatting, and then moved afterward.")
(setq refill-start (point))
(goto-char p2)
(re-search-backward ".+[^<][^b][^r][^>]$" refill-start t)
(next-line 1)
(forward-line 1)
;; refill-stop should ideally be adjusted to
;; accomodate the "<br>" strings which are removed
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment