Synch to No Gnus 200512190519.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05b29c7..fe4a219 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-19  Mark Plaksin <happy@mcplaksin.org>  (tiny change)
+
+       * nnrss.el (nnrss-check-group): Put the RSS dc:subject in the
+       article.
+
 2005-12-18  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * nnml.el: Don't require gnus-bcklg.  Autoload it.

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 4560b5b..8756cd0 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -533,7 +533,7 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
 ;;; Snarf functions
 
 (defun nnrss-check-group (group server)
-  (let (file xml subject url extra changed author date
+  (let (file xml subject url extra changed author date feed-subject
             enclosure comments rss-ns rdf-ns content-ns dc-ns)
     (if (and nnrss-use-local
             (file-exists-p (setq file (expand-file-name
@@ -576,6 +576,8 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
        (setq extra (or extra
                        (nnrss-node-text content-ns 'encoded item)
                        (nnrss-node-text rss-ns 'description item)))
+        (if (setq feed-subject (nnrss-node-text dc-ns 'subject item))
+            (setq extra (concat feed-subject "<br /><br />\n" extra)))
        (setq author (or (nnrss-node-text rss-ns 'author item)
                         (nnrss-node-text dc-ns 'creator item)
                         (nnrss-node-text dc-ns 'contributor item)))