From: yamaoka <yamaoka>
Date: Tue, 4 Oct 2005 22:43:56 +0000 (+0000)
Subject: Synch to No Gnus 200510042243.
X-Git-Tag: t-gnus-6_17_4-quimby-~321
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=10e4b48203f204fd3608c07e21853ac081643c89;p=elisp%2Fgnus.git-

Synch to No Gnus 200510042243.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b9d1f2..1a04876 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-04  David Hansen  <david.hansen@gmx.net>
+
+	* nnrss.el (nnrss-request-article): Add support for the comments tag.
+	(nnrss-check-group): Ditto.
+
 2005-10-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* mm-uu.el (mm-uu-verbatim-marks-extract, mm-uu-latex-extract):
diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index fe6fcc4..4560b5b 100644
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -229,9 +229,10 @@ The return value will be `html' or `text'."
 				   " ")))
 	      (link (nth 2 e))
 	      (enclosure (nth 7 e))
+	      (comments (nth 8 e))
 	      (mail-header-separator "")
 	      mime-edit-insert-user-agent-field)
-	  (when (or text link enclosure)
+	  (when (or text link enclosure comments)
 	    (if (eq 'html (nnrss-body-presentation-method))
 		(progn
 		  (mime-edit-insert-text "html")
@@ -244,6 +245,8 @@ The return value will be `html' or `text'."
 		    (insert "<p><a href=\"" (car enclosure) "\">"
 			    (cadr enclosure) "</a> " (nth 2 enclosure)
 			    " " (nth 3 enclosure) "</p>\n"))
+		  (when comments
+		    (insert "<p><a href=\"" comments "\">comments</a></p>\n"))
 		  (insert "</body></html>\n"))
 	      (mime-edit-insert-text "plain")
 	      (when text
@@ -255,7 +258,9 @@ The return value will be `html' or `text'."
 	      (when enclosure
 		(insert (car enclosure) " "
 			(nth 2 enclosure) " "
-			(nth 3 enclosure) "\n")))
+			(nth 3 enclosure) "\n"))
+	      (when comments
+		(insert comments "\n")))
 	    (mime-edit-translate-body)))
 	(when nnrss-content-function
 	  (funcall nnrss-content-function e group article))))
@@ -529,7 +534,7 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
 
 (defun nnrss-check-group (group server)
   (let (file xml subject url extra changed author date
-	     enclosure rss-ns rdf-ns content-ns dc-ns)
+	     enclosure comments rss-ns rdf-ns content-ns dc-ns)
     (if (and nnrss-use-local
 	     (file-exists-p (setq file (expand-file-name
 					(nnrss-translate-file-chars
@@ -577,6 +582,7 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
 	(setq date (or (nnrss-node-text dc-ns 'date item)
 		       (nnrss-node-text rss-ns 'pubDate item)
 		       (message-make-date)))
+	(setq comments (nnrss-node-text rss-ns 'comments item))
 	(when (setq enclosure (cadr (assq (intern (concat rss-ns "enclosure")) item)))
 	  (let ((url (cdr (assq 'url enclosure)))
 		(len (cdr (assq 'length enclosure)))
@@ -607,7 +613,8 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
 	  (and author (nnrss-mime-encode-string author))
 	  date
 	  (and extra (nnrss-decode-entities-string extra))
-	  enclosure)
+	  enclosure
+	  comments)
 	 nnrss-group-data)
 	(puthash (or url extra) t nnrss-group-hashtb)
 	(setq changed t))