projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch.
[elisp/gnus.git-]
/
lisp
/
nnweb.el
diff --git
a/lisp/nnweb.el
b/lisp/nnweb.el
index
5df3018
..
de3bb7f
100644
(file)
--- a/
lisp/nnweb.el
+++ b/
lisp/nnweb.el
@@
-1,5
+1,6
@@
;;; nnweb.el --- retrieving articles via web search engines
;;; nnweb.el --- retrieving articles via web search engines
-;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
@@
-121,7
+122,6
@@
and `altavista'.")
(deffoo nnweb-request-scan (&optional group server)
(nnweb-possibly-change-server group server)
(deffoo nnweb-request-scan (&optional group server)
(nnweb-possibly-change-server group server)
- (setq nnweb-hashtb (gnus-make-hashtable 4095))
(funcall (nnweb-definition 'map))
(unless nnweb-ephemeral-p
(nnweb-write-active)
(funcall (nnweb-definition 'map))
(unless nnweb-ephemeral-p
(nnweb-write-active)
@@
-139,8
+139,6
@@
and `altavista'.")
(setq nnweb-search (nth 3 info))
(unless dont-check
(nnweb-read-overview group)))))
(setq nnweb-search (nth 3 info))
(unless dont-check
(nnweb-read-overview group)))))
- (unless dont-check
- (nnweb-request-scan group))
(cond
((not nnweb-articles)
(nnheader-report 'nnweb "No matching articles"))
(cond
((not nnweb-articles)
(nnheader-report 'nnweb "No matching articles"))
@@
-293,6
+291,7
@@
and `altavista'.")
(when group
(when (and (not nnweb-ephemeral-p)
(not (equal group nnweb-group)))
(when group
(when (and (not nnweb-ephemeral-p)
(not (equal group nnweb-group)))
+ (setq nnweb-hashtb (gnus-make-hashtable 4095))
(nnweb-request-group group nil t))))
(defun nnweb-init (server)
(nnweb-request-group group nil t))))
(defun nnweb-init (server)
@@
-395,6
+394,8
@@
and `altavista'.")
(setq date "Jan 1 00:00:00 0000"))
(incf i)
(setq url (concat url "&fmt=text"))
(setq date "Jan 1 00:00:00 0000"))
(incf i)
(setq url (concat url "&fmt=text"))
+ (when (string-match "&context=[^&]+" url)
+ (setq url (replace-match "" t t url)))
(unless (nnweb-get-hashtb url)
(push
(list
(unless (nnweb-get-hashtb url)
(push
(list
@@
-760,7
+761,7
@@
If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
(url-insert-file-contents url)
(goto-char (point-min))
(when (re-search-forward
(url-insert-file-contents url)
(goto-char (point-min))
(when (re-search-forward
- "HTTP-EQUIV=\"Refresh\"[^>]*URL=\\([^\"]+\\)\"" nil t)
+ "<meta[ \t\r\n]*http-equiv=\"Refresh\"[^>]*URL=\\([^\"]+\\)\"" nil t)
(let ((url (match-string 1)))
(delete-region (point-min) (point-max))
(nnweb-insert url t))))
(let ((url (match-string 1)))
(delete-region (point-min) (point-max))
(nnweb-insert url t))))