diff options
Diffstat (limited to 'lisp/gnus/nnlistserv.el')
| -rw-r--r-- | lisp/gnus/nnlistserv.el | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lisp/gnus/nnlistserv.el b/lisp/gnus/nnlistserv.el index b6ce46c82f2..770bb02d01e 100644 --- a/lisp/gnus/nnlistserv.el +++ b/lisp/gnus/nnlistserv.el @@ -24,18 +24,13 @@ ;;; Commentary: -;; Note: You need to have `url' and `w3' installed for this -;; backend to work. - ;;; Code: (eval-when-compile (require 'cl)) (require 'nnoo) -(eval-when-compile - (ignore-errors - (require 'nnweb)) ; requires W3 - (autoload 'url-insert-file-contents "nnweb")) +(require 'mm-url) +(require 'nnweb) (nnoo-declare nnlistserv nnweb) @@ -98,7 +93,7 @@ (when (funcall (nnweb-definition 'search) page) ;; Go through all the article hits on this page. (goto-char (point-min)) - (nnweb-decode-entities) + (mm-url-decode-entities) (goto-char (point-min)) (while (re-search-forward "^<li> *<a href=\"\\([^\"]+\\)\"><b>\\([^\\>]+\\)</b></a> *<[^>]+><i>\\([^>]+\\)<" nil t) (setq url (match-string 1) @@ -124,7 +119,7 @@ (let ((case-fold-search t) (headers '(sent name email subject id)) sent name email subject id) - (nnweb-decode-entities) + (mm-url-decode-entities) (while headers (goto-char (point-min)) (re-search-forward (format "<!-- %s=\"\\([^\"]+\\)" (car headers)) nil t) @@ -135,7 +130,7 @@ (goto-char (point-max)) (search-backward "<!-- body" nil t) (delete-region (point-max) (progn (beginning-of-line) (point))) - (nnweb-remove-markup) + (mm-url-remove-markup) (goto-char (point-min)) (insert (format "From: %s <%s>\n" name email) (format "Subject: %s\n" subject) @@ -143,7 +138,7 @@ (format "Date: %s\n\n" sent)))) (defun nnlistserv-kk-search (search) - (url-insert-file-contents + (mm-url-insert (concat (format (nnweb-definition 'address) search) (nnweb-definition 'index))) t) |