Mercurial > emacs
changeset 72084:002ee31c5102
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 118-120)
- Merge from emacs--devo--0
- Update from CVS
2006-07-19 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* lisp/gnus/mm-url.el (mm-url-insert-file-contents): Inhibit Connection: close
workaround for the url package included with Emacs.
* lisp/gnus/nnweb.el (nnweb-google-create-mapping): Update regexp.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-367
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 24 Jul 2006 10:53:10 +0000 |
| parents | bb51418c995c |
| children | eeafd2670b7f |
| files | lisp/gnus/ChangeLog lisp/gnus/mm-url.el lisp/gnus/nnweb.el |
| diffstat | 3 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Jul 24 09:40:09 2006 +0000 +++ b/lisp/gnus/ChangeLog Mon Jul 24 10:53:10 2006 +0000 @@ -1,3 +1,10 @@ +2006-07-19 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> + + * mm-url.el (mm-url-insert-file-contents): Inhibit Connection: close + workaround for the url package included with Emacs. + + * nnweb.el (nnweb-google-create-mapping): Update regexp. + 2006-07-18 Karl Fogel <kfogel@red-bean.com> * nnmail.el (nnmail-article-group): If splitting raises an error, give
--- a/lisp/gnus/mm-url.el Mon Jul 24 09:40:09 2006 +0000 +++ b/lisp/gnus/mm-url.el Mon Jul 24 10:53:10 2006 +0000 @@ -301,7 +301,13 @@ (list url (buffer-size))) (mm-url-load-url) (let ((name buffer-file-name) - (url-request-extra-headers (list (cons "Connection" "Close"))) + (url-request-extra-headers + ;; ISTM setting a Connection header was a workaround for + ;; older versions of url included with w3, but it does more + ;; harm than good with the one shipped with Emacs. --ansel + (if (not (and (boundp 'url-version) + (equal url-version "Emacs"))) + (list (cons "Connection" "Close")))) (url-package-name (or mm-url-package-name url-package-name)) (url-package-version (or mm-url-package-version
--- a/lisp/gnus/nnweb.el Mon Jul 24 09:40:09 2006 +0000 +++ b/lisp/gnus/nnweb.el Mon Jul 24 10:53:10 2006 +0000 @@ -416,7 +416,7 @@ (goto-char (point-min)) (incf i 100) (if (or (not (re-search-forward - "<a href=\"\n\\([^>\" \n\t]+\\)[^<]*<img src=[^>]+next" + "<a [^>]+href=\"\n?\\([^>\" \n\t]+\\)[^<]*<img[^>]+src=[^>]+next" nil t)) (>= i nnweb-max-hits)) (setq more nil)