diff options
Diffstat (limited to 'lisp/gnus/nnrss.el')
| -rw-r--r-- | lisp/gnus/nnrss.el | 76 |
1 files changed, 14 insertions, 62 deletions
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index aa7c8e584a5..97c9f18a602 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -200,7 +200,7 @@ for decoding when the cdr that the data specify is not available.") (nnrss-possibly-change-group group server) (let ((e (assq article nnrss-group-data)) (nntp-server-buffer (or buffer nntp-server-buffer)) - err) ;; post + ) ;; err post (when e (with-current-buffer nntp-server-buffer (erase-buffer) @@ -302,8 +302,7 @@ for decoding when the cdr that the data specify is not available.") (when nnrss-content-function (funcall nnrss-content-function e group article)))) (cond - (err - (nnheader-report 'nnrss err)) + ;; (err (nnheader-report 'nnrss err)) ((not e) (nnheader-report 'nnrss "no such id: %d" article)) (t @@ -786,7 +785,7 @@ It is useful when `(setq nnrss-use-local t)'." (nnrss-node-just-text node) node)) (cleaned-text (if text - (replace-regexp-in-string + (string-replace "\r\n" "\n" (replace-regexp-in-string "^[\000-\037\177]+\\|^ +\\| +$" "" @@ -850,7 +849,7 @@ DATA should be the output of `xml-parse-region'." (defmacro nnrss-match-macro (base-uri item onsite-list offsite-list) `(cond ((or (string-match (concat "^" ,base-uri) ,item) - (not (string-match "://" ,item))) + (not (string-search "://" ,item))) (setq ,onsite-list (append ,onsite-list (list ,item)))) (t (setq ,offsite-list (append ,offsite-list (list ,item)))))) @@ -931,60 +930,7 @@ Use Mark Pilgrim's `ultra-liberal rss locator'." (setq rss-link (nnrss-rss-title-description rss-ns href-data (car hrefs)))) (setq hrefs (cdr hrefs))))) - (if rss-link - rss-link - ;; 4. check syndic8 - (nnrss-find-rss-via-syndic8 url)))))))) - -(declare-function xml-rpc-method-call "ext:xml-rpc" - (server-url method &rest params)) - -(defun nnrss-find-rss-via-syndic8 (url) - "Query syndic8 for the rss feeds it has for URL." - (if (not (locate-library "xml-rpc")) - (progn - (message "XML-RPC is not available... not checking Syndic8.") - nil) - (require 'xml-rpc) - (let ((feedid (xml-rpc-method-call - "http://www.syndic8.com/xmlrpc.php" - 'syndic8.FindSites - url))) - (when feedid - (let* ((feedinfo (xml-rpc-method-call - "http://www.syndic8.com/xmlrpc.php" - 'syndic8.GetFeedInfo - feedid)) - (urllist - (delq nil - (mapcar - (lambda (listinfo) - (if (string-equal - (cdr (assoc "status" listinfo)) - "Syndicated") - (cons - (cdr (assoc "sitename" listinfo)) - (list - (cons 'title - (cdr (assoc - "sitename" listinfo))) - (cons 'href - (cdr (assoc - "dataurl" listinfo))))))) - feedinfo)))) - (if (not (> (length urllist) 1)) - (cdar urllist) - (let ((completion-ignore-case t) - (selection - (mapcar (lambda (listinfo) - (cons (cdr (assoc "sitename" listinfo)) - (string-to-number - (cdr (assoc "feedid" listinfo))))) - feedinfo))) - (cdr (assoc - (gnus-completing-read - "Multiple feeds found. Select one" - selection t) urllist))))))))) + rss-link)))))) (defun nnrss-rss-p (data) "Test if DATA is an RSS feed. @@ -1008,9 +954,10 @@ Simply ensures that the first element is rss or rdf." "Given EL (containing a parsed element) and URI (containing a string that gives the URI for which you want to retrieve the namespace prefix), return the prefix." - (let* ((prefix (car (rassoc uri (dom-attributes - (dom-search - el + (let* ((dom (car el)) + (prefix (car (rassoc uri (dom-attributes + (dom-search + dom (lambda (node) (rassoc uri (dom-attributes node)))))))) (nslist (if prefix @@ -1023,6 +970,11 @@ prefix), return the prefix." (concat ns ":") ns))) +(defun nnrss-find-rss-via-syndic8 (_url) + "This function is obsolete and does nothing. Syndic8 shut down in 2013." + (declare (obsolete nil "28.1")) + nil) + (provide 'nnrss) ;;; nnrss.el ends here |