projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(spam-report-user-mail-address)
[gnus]
/
lisp
/
nnwfm.el
diff --git
a/lisp/nnwfm.el
b/lisp/nnwfm.el
index
27d2b72
..
d759d12
100644
(file)
--- a/
lisp/nnwfm.el
+++ b/
lisp/nnwfm.el
@@
-1,5
+1,6
@@
;;; nnwfm.el --- interfacing with a web forum
;;; nnwfm.el --- interfacing with a web forum
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
@@
-18,8
+19,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Commentary:
;;; Commentary:
@@
-36,11
+37,9
@@
(require 'gnus)
(require 'nnmail)
(require 'mm-util)
(require 'gnus)
(require 'nnmail)
(require 'mm-util)
-(eval-when-compile
- (ignore-errors
- (require 'nnweb)))
-;; Report failure to find w3 at load time if appropriate.
-(eval '(require 'nnweb))
+(require 'mm-url)
+(require 'nnweb)
+(autoload 'w3-parse-buffer "w3-parse")
(nnoo-declare nnwfm)
(nnoo-declare nnwfm)
@@
-116,7
+115,7
@@
(erase-buffer)
(setq subject (nth 2 (assq (car elem) topics))
thread-id (nth 0 (assq (car elem) topics)))
(erase-buffer)
(setq subject (nth 2 (assq (car elem) topics))
thread-id (nth 0 (assq (car elem) topics)))
- (
nnweb
-insert
+ (
mm-url
-insert
(concat nnwfm-address
(format "Item.asp?GroupID=%d&ThreadID=%d" sid
thread-id)))
(concat nnwfm-address
(format "Item.asp?GroupID=%d&ThreadID=%d" sid
thread-id)))
@@
-216,7
+215,7
@@
(deffoo nnwfm-request-list (&optional server)
(nnwfm-possibly-change-server nil server)
(mm-with-unibyte-buffer
(deffoo nnwfm-request-list (&optional server)
(nnwfm-possibly-change-server nil server)
(mm-with-unibyte-buffer
- (
nnweb
-insert
+ (
mm-url
-insert
(if (string-match "/$" nnwfm-address)
(concat nnwfm-address "Group.asp")
nnwfm-address))
(if (string-match "/$" nnwfm-address)
(concat nnwfm-address "Group.asp")
nnwfm-address))
@@
-279,7
+278,7
@@
(while furls
(erase-buffer)
(push (car furls) fetched-urls)
(while furls
(erase-buffer)
(push (car furls) fetched-urls)
- (
nnweb
-insert (pop furls))
+ (
mm-url
-insert (pop furls))
(goto-char (point-min))
(while (re-search-forward " wr(" nil t)
(forward-char -1)
(goto-char (point-min))
(while (re-search-forward " wr(" nil t)
(forward-char -1)
@@
-299,12
+298,13
@@
(when (re-search-forward "href=\"\\(Thread.*DateLast=\\([^\"]+\\)\\)"
nil t)
(setq url (match-string 1)
(when (re-search-forward "href=\"\\(Thread.*DateLast=\\([^\"]+\\)\\)"
nil t)
(setq url (match-string 1)
- time (nnwfm-date-to-time (url-unhex-string (match-string 2))))
+ time (nnwfm-date-to-time (gnus-url-unhex-string
+ (match-string 2))))
(when (and (nnwfm-new-threads-p group time)
(not (member
(setq url (concat
nnwfm-address
(when (and (nnwfm-new-threads-p group time)
(not (member
(setq url (concat
nnwfm-address
- (
nnweb
-decode-entities-string url)))
+ (
mm-url
-decode-entities-string url)))
fetched-urls)))
(push url furls))))
;; The main idea here is to map Gnus article numbers to
fetched-urls)))
(push url furls))))
;; The main idea here is to map Gnus article numbers to
@@
-429,4
+429,5
@@
;; coding: iso-8859-1
;; End:
;; coding: iso-8859-1
;; End:
+;;; arch-tag: d813966a-4211-4557-ad11-d1ac2bc86536
;;; nnwfm.el ends here
;;; nnwfm.el ends here