projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(mm-display-external): Add lacked cdr. From ARISAWA Akihiro.
[gnus]
/
lisp
/
nnrss.el
diff --git
a/lisp/nnrss.el
b/lisp/nnrss.el
index
113bc80
..
2bb6e5f
100644
(file)
--- a/
lisp/nnrss.el
+++ b/
lisp/nnrss.el
@@
-1,5
+1,6
@@
;;; nnrss.el --- interfacing with RSS
;;; nnrss.el --- interfacing with RSS
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: RSS
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: RSS
@@
-18,8
+19,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Commentary:
;;; Commentary:
@@
-196,6
+197,7
@@
for decoding when the cdr that the data specify is not available.")
" ")))
(link (nth 2 e))
(enclosure (nth 7 e))
" ")))
(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
;; Enable encoding of Newsgroups header in XEmacs.
(default-enable-multibyte-characters t)
(rfc2047-header-encoding-alist
@@
-204,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)
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")
(insert "\n")
(insert "<#multipart type=alternative>\n"
"<#part type=\"text/plain\">\n")
@@
-219,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"))
(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"
(setq body (buffer-substring body (point)))
(insert "<#/part>\n"
"<#part type=\"text/html\">\n"
@@
-231,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"))
(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"))
(insert "</body></html>\n"
"<#/part>\n"
"<#/multipart>\n"))
@@
-528,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
(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
(if (and nnrss-use-local
(file-exists-p (setq file (expand-file-name
(nnrss-translate-file-chars
@@
-576,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 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)))
(when (setq enclosure (cadr (assq (intern (concat rss-ns "enclosure")) item)))
(let ((url (cdr (assq 'url enclosure)))
(len (cdr (assq 'length enclosure)))
@@
-606,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))
(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))
nnrss-group-data)
(puthash (or url extra) t nnrss-group-hashtb)
(setq changed t))