Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-597

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 133-141)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: texi/gnus.texi (RSS): Fix key description.
   - Update from CVS: texi/gnus.texi (Document Server Internals): Addition.

2005-10-04  David Hansen  <david.hansen@gmx.net>

   * lisp/gnus/nnrss.el (nnrss-request-article): Add support for the comments tag.
   (nnrss-check-group): Ditto.

2005-10-14  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Document Server Internals): Addition.

2005-10-13  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (A note on namespaces): Fix RFC reference.

2005-10-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (RSS): Fix key description.

2005-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi: Emacs/w3 -> Emacs/W3.
   (Browsing the Web): Fix description.
   (Web Searches): Ditto.
   (Customizing W3): Ditto.

2005-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Maildir): Clarify expire-age and expire-group.

2 files changed, 15 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 23e5564770f..abbfb096ab1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -21,6 +21,11 @@
         * pgg-def.el (top-level): Don't require custom, it is
         autoloaded.  (To sync with No Gnus.)
 
+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-url.el (mm-url-predefined-programs): Add switches for curl.
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index 5018701ee42..adef035c830 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -197,6 +197,7 @@ for decoding when the cdr that the data specify is not available.")
                                    " ")))
               (link (nth 2 e))
               (enclosure (nth 7 e))
+              (comments (nth 8 e))
               ;; Enable encoding of Newsgroups header in XEmacs.
               (default-enable-multibyte-characters t)
               (rfc2047-header-encoding-alist
@@ -205,7 +206,7 @@ for decoding when the cdr that the data specify is not available.")
                          rfc2047-header-encoding-alist)
                  rfc2047-header-encoding-alist))
               rfc2047-encode-encoded-words body)
-          (when (or text link enclosure)
+          (when (or text link enclosure comments)
             (insert "\n")
             (insert "<#multipart type=alternative>\n"
                     "<#part type=\"text/plain\">\n")
@@ -220,6 +221,8 @@ for decoding when the cdr that the data specify is not available.")
               (insert (car enclosure) " "
                       (nth 2 enclosure) " "
                       (nth 3 enclosure) "\n"))
+            (when comments
+              (insert comments "\n"))
             (setq body (buffer-substring body (point)))
             (insert "<#/part>\n"
                     "<#part type=\"text/html\">\n"
@@ -232,6 +235,8 @@ for decoding when the cdr that the data specify is not available.")
               (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"
                     "<#/part>\n"
                     "<#/multipart>\n"))
@@ -528,7 +533,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
@@ -576,6 +581,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)))
@@ -606,7 +612,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)
         (gnus-sethash (or url extra) t nnrss-group-hashtb)
         (setq changed t))