diff options
| author | Miles Bader <miles@gnu.org> | 2006-07-19 01:06:00 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-07-19 01:06:00 +0000 |
| commit | 7ce31649a332b78b39c78ef9bc12a377151bacd9 (patch) | |
| tree | 5dc33b86f252e5f9e2a1adb53a6eb1e0a99e8741 /lisp/gnus/nnweb.el | |
| parent | 83676aa2e399363120942ef5ea19f8af6b75e8e8 (diff) | |
| download | emacs-7ce31649a332b78b39c78ef9bc12a377151bacd9.tar.gz | |
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 116-117)
- Update from CVS
2006-07-18 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
[ Backported bug fixes from No Gnus. ]
* lisp/gnus/nnweb.el (nnweb-google-parse-1): Update regexp for author and date.
(nnweb-google-search): Respect nnweb-max-hits as upper bound.
(nnweb-request-article): Do proper xwfu encoding when fetching articles
by message-id.
* lisp/gnus/gnus-srvr.el (gnus-browse-unsubscribe-group): Don't subscribe
unsubscribed groups as if they were killed ones. It causes duplicate
entries in gnus-newsrc-alist.
2006-07-17 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-sum.el (gnus-summary-delete-article): Don't use TAB in doc
string.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-357
Diffstat (limited to 'lisp/gnus/nnweb.el')
| -rw-r--r-- | lisp/gnus/nnweb.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el index a67d5a469f6..b4bba2aba0f 100644 --- a/lisp/gnus/nnweb.el +++ b/lisp/gnus/nnweb.el @@ -171,7 +171,8 @@ Valid types include `google', `dejanews', and `gmane'.") (when (string-match "^<\\(.*\\)>$" article) (setq art (match-string 1 article))) (when (and fetch art) - (setq url (format fetch art)) + (setq url (format fetch + (mm-url-form-encode-xwfu art))) (mm-with-unibyte-current-buffer (mm-url-insert url)) (if (nnweb-definition 'reference t) @@ -365,7 +366,7 @@ Valid types include `google', `dejanews', and `gmane'.") (mm-url-decode-entities) (search-backward " - ") (when (looking-at - " - \\([a-zA-Z]+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?, [^\n]+by \\([^<\n]+\\)\n") + " - \\([a-zA-Z]+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?[^\n]+by ?\n?\\([^<\n]+\\)\n") (setq From (match-string 4) Date (format "%s %s 00:00:00 %s" (match-string 1) @@ -437,7 +438,8 @@ Valid types include `google', `dejanews', and `gmane'.") "?" (mm-url-encode-www-form-urlencoded `(("q" . ,search) - ("num" . "100") + ("num" . ,(number-to-string + (min 100 nnweb-max-hits))) ("hq" . "") ("hl" . "en") ("lr" . "") |