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  <yamaoka@jpl.org>

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

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

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

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-137
parent b6ff295c
......@@ -2,6 +2,16 @@
* gnus-group.el (gnus-group-highlight): Mark as risky.
2007-10-23 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus.el (gnus-server-to-method): Return method found first in
gnus-newsrc-alist.
2007-10-20 Reiner Steib <Reiner.Steib@gmx.de>
* html2text.el (html2text-fix-paragraph): Use `forward-line' instead of
`next-line'.
2007-10-18 Katsumi Yamaoka <yamaoka@jpl.org>
* nnmail.el (nnmail-fancy-expiry-target): Use rmail-dont-reply-to to
......
......@@ -3512,24 +3512,23 @@ that that variable is buffer-local to the summary buffers."
(cadar servers)))))
(pop servers))
(car servers))
;; This could be some sort of foreign server that I
;; simply haven't opened (yet). Do a brute-force scan
;; of the entire gnus-newsrc-alist for the server name
;; of every method. As a side-effect, loads the
;; gnus-server-method-cache so this only happens once,
;; if at all.
(let (match)
(mapcar
(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))
match))))
(when result
(push (cons server result) gnus-server-method-cache))
;; This could be some sort of foreign server that I
;; simply haven't opened (yet). Do a brute-force scan
;; of the entire gnus-newsrc-alist for the server name
;; of every method. As a side-effect, loads the
;; gnus-server-method-cache so this only happens once,
;; if at all.
(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)))
match))))
(when result
(push (cons server result) gnus-server-method-cache))
result)))
(defsubst gnus-server-get-method (group method)
......
......@@ -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)
(end-of-line)
;; 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