gnus-notifications: add actions support

[gnus] / lisp / nnrss.el

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 32b4f4f..d35d7c6 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -1,7 +1,6 @@
 ;;; nnrss.el --- interfacing with RSS
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: RSS
@@ -25,7 +24,7 @@
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
@@ -114,11 +113,6 @@ The cdr of each element is used to decode data if it is available when
 the car is what the data specify as the encoding.  Or, the car is used
 for decoding when the cdr that the data specify is not available.")
 
-(defvar nnrss-wash-html-in-text-plain-parts nil
-  "*Non-nil means render text in text/plain parts as HTML.
-The function specified by the `mm-text-html-renderer' variable will be
-used to render text.  If it is nil, text will simply be folded.")
-
 (nnoo-define-basics nnrss)
 
 ;;; Interface functions
@@ -197,9 +191,6 @@ used to render text.  If it is nil, text will simply be folded.")
 (deffoo nnrss-close-group (group &optional server)
   t)
 
-(defvar mm-text-html-renderer)
-(defvar mm-text-html-washer-alist)
-
 (deffoo nnrss-request-article (article &optional group server buffer)
   (setq group (nnrss-decode-group-name group))
   (when (stringp article)
@@ -240,46 +231,25 @@ used to render text.  If it is nil, text will simply be folded.")
            (when text
              (insert text)
              (goto-char body)
-             (if (and nnrss-wash-html-in-text-plain-parts
-                      (progn
-                        (require 'mm-view)
-                        (setq fn (or (cdr (assq mm-text-html-renderer
-                                                mm-text-html-washer-alist))
-                                     mm-text-html-renderer))))
-                 (progn
-                   (narrow-to-region body (point-max))
-                   (if (functionp fn)
-                       (funcall fn)
-                     (apply (car fn) (cdr fn)))
-                   (widen)
-                   (goto-char body)
-                   (re-search-forward "[^\t\n ]" nil t)
-                   (beginning-of-line)
-                   (delete-region body (point))
-                   (goto-char (point-max))
-                   (skip-chars-backward "\t\n ")
-                   (end-of-line)
-                   (delete-region (point) (point-max))
-                   (insert "\n"))
-               (while (re-search-forward "\n+" nil t)
-                 (replace-match " "))
-               (goto-char body)
-               ;; See `nnrss-check-group', which inserts "<br /><br />".
-               (when (search-forward "<br /><br />" nil t)
-                 (if (eobp)
-                     (replace-match "\n")
-                   (replace-match "\n\n")))
-               (unless (eobp)
-                 (let ((fill-column (default-value 'fill-column))
-                       (window (get-buffer-window nntp-server-buffer)))
-                   (when window
-                     (setq fill-column
-                           (max 1 (/ (* (window-width window) 7) 8))))
-                   (fill-region (point) (point-max))
-                   (goto-char (point-max))
-                   ;; XEmacs version of `fill-region' inserts newline.
-                   (unless (bolp)
-                     (insert "\n")))))
+             (while (re-search-forward "\n+" nil t)
+               (replace-match " "))
+             (goto-char body)
+             ;; See `nnrss-check-group', which inserts "<br /><br />".
+             (when (search-forward "<br /><br />" nil t)
+               (if (eobp)
+                   (replace-match "\n")
+                 (replace-match "\n\n")))
+             (unless (eobp)
+               (let ((fill-column (default-value 'fill-column))
+                     (window (get-buffer-window nntp-server-buffer)))
+                 (when window
+                   (setq fill-column
+                         (max 1 (/ (* (window-width window) 7) 8))))
+                 (fill-region (point) (point-max))
+                 (goto-char (point-max))
+                 ;; XEmacs version of `fill-region' inserts newline.
+                 (unless (bolp)
+                   (insert "\n"))))
              (when (or link enclosure)
                (insert "\n")))
            (when link
@@ -393,12 +363,13 @@ used to render text.  If it is nil, text will simply be folded.")
 
 (deffoo nnrss-retrieve-groups (groups &optional server)
   (dolist (group groups)
+    (setq group (nnrss-decode-group-name group))
     (nnrss-possibly-change-group group server)
     (nnrss-check-group group server))
   (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (dolist (group groups)
-      (let ((elem (assoc group nnrss-server-data)))
+      (let ((elem (assoc (gnus-group-decoded-name group) nnrss-server-data)))
        (insert (format "%S %s 1 y\n" group (or (cadr elem) 0)))))
     'active))
 
@@ -703,9 +674,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 +934,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)))