diff lisp/gnus/nnrss.el @ 110468:8ceac426a2d7

merge trunk

--- a/lisp/gnus/nnrss.el	Fri Sep 17 14:07:47 2010 +0900
+++ b/lisp/gnus/nnrss.el	Tue Sep 21 20:45:10 2010 +0900
@@ -134,8 +134,7 @@
   (setq group (nnrss-decode-group-name group))
   (nnrss-possibly-change-group group server)
   (let (e)
-    (save-excursion
-      (set-buffer nntp-server-buffer)
+    (with-current-buffer nntp-server-buffer
       (erase-buffer)
       (dolist (article articles)
 	(if (setq e (assq article nnrss-group-data))
@@ -179,7 +178,7 @@
 		    "\n")))))
   'nov)
 
-(deffoo nnrss-request-group (group &optional server dont-check)
+(deffoo nnrss-request-group (group &optional server dont-check info)
   (setq group (nnrss-decode-group-name group))
   (nnheader-message 6 "nnrss: Requesting %s..." group)
   (nnrss-possibly-change-group group server)
@@ -384,8 +383,7 @@
 
 (deffoo nnrss-request-list-newsgroups (&optional server)
   (nnrss-possibly-change-group nil server)
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (dolist (elem nnrss-group-alist)
       (if (third elem)
@@ -396,8 +394,7 @@
   (nnrss-possibly-change-group nil server)
   (dolist (group groups)
     (nnrss-check-group group server))
-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (dolist (group groups)
       (let ((elem (assoc group nnrss-server-data)))