diff options
author | Gnus developers <ding@gnus.org> | 2010-10-06 12:38:45 +0000 |
---|---|---|
committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-06 12:38:45 +0000 |
commit | 66627fa93ccb57773210dc8968f185140e008d30 (patch) | |
tree | 53027723ccc7a6cf0f34f93045bca148e169425c /lisp/gnus/nnrss.el | |
parent | e44eccd7dba3e3a996f956fdf4305c39bb807dcc (diff) | |
download | emacs-66627fa93ccb57773210dc8968f185140e008d30.tar.gz emacs-66627fa93ccb57773210dc8968f185140e008d30.tar.bz2 emacs-66627fa93ccb57773210dc8968f185140e008d30.zip |
Merge changes made in Gnus trunk.
shr.el: Rearrange function order to be more logical.
gnus-faq.texi: Remove reference to my.gnus.org
message.el (message-change-subject): Remove 404 URL in a comment.
nnir.el: Fix Swish-E URL.
nnir.el: Fix Namazu URL.
nnrss.el (nnrss-check-group): Remove 404 URL in comment.
nnrss.el (nnrss-discover-feed): Remove 404 URL in docstring.
gnus-faq.texi (FAQ 5-5): Fix Flyspell URL.
gnus-faq.texi (FAQ 7-1): Fix getmail URL.
gnus.texi (Comparing Mail Back Ends): Remove broken link and allusion to ReiserFS.
nnimap.el (nnimap-open-connection): Prepare to support open-gnutls-stream.
shr.el (shr-insert): Get 'space transition right.
message.texi: Remove reference to gpg-2comp.
Diffstat (limited to 'lisp/gnus/nnrss.el')
-rw-r--r-- | lisp/gnus/nnrss.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 32b4f4f116f..743fba53e52 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -703,9 +703,6 @@ which RSS 2.0 allows." (push (list group nnrss-group-max url) nnrss-server-data))) (setq changed t)) (setq xml (nnrss-fetch url))) - ;; See - ;; http://feeds.archive.org/validator/docs/howto/declare_namespaces.html - ;; for more RSS namespaces. (setq dc-ns (nnrss-get-namespace-prefix xml "http://purl.org/dc/elements/1.1/") rdf-ns (nnrss-get-namespace-prefix xml "http://www.w3.org/1999/02/22-rdf-syntax-ns#") rss-ns (nnrss-get-namespace-prefix xml "http://purl.org/rss/1.0/") @@ -966,7 +963,7 @@ whether they are `offsite' or `onsite'." (defun nnrss-discover-feed (url) "Given a page, find an RSS feed using Mark Pilgrim's -`ultra-liberal rss locator' (URL `http://diveintomark.org/2002/08/15.html')." +`ultra-liberal rss locator'." (let ((parsed-page (nnrss-fetch url))) |