X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-bcklg.el;h=b7a63659d82ef8ad3900db0ee43b2ba5656da8fc;hb=b52037f4a9c6bee1ff556c22750e158da1208d4b;hp=5eb349fa980d042ae3ae7f059b486bb357e284dd;hpb=fe70196e10cdd849981dbd014882fb20237d0740;p=gnus

diff --git a/lisp/gnus-bcklg.el b/lisp/gnus-bcklg.el
index 5eb349fa9..b7a63659d 100644
--- a/lisp/gnus-bcklg.el
+++ b/lisp/gnus-bcklg.el
@@ -1,27 +1,24 @@
 ;;; gnus-bcklg.el --- backlog functions for Gnus
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -42,8 +39,7 @@
 (defun gnus-backlog-buffer ()
   "Return the backlog buffer."
   (or (get-buffer gnus-backlog-buffer)
-      (save-excursion
-	(set-buffer (gnus-get-buffer-create gnus-backlog-buffer))
+      (with-current-buffer (gnus-get-buffer-create gnus-backlog-buffer)
 	(buffer-disable-undo)
 	(setq buffer-read-only t)
 	(get-buffer gnus-backlog-buffer))))
@@ -65,7 +61,7 @@
 
 (defun gnus-backlog-enter-article (group number buffer)
   (when (and (numberp number)
-	     (not (string-match "^nnvirtual" group)))
+	     (not (gnus-virtual-group-p group)))
     (gnus-backlog-setup)
     (let ((ident (intern (concat group ":" (int-to-string number))
 			 gnus-backlog-hashtb))
@@ -78,8 +74,7 @@
 	   (gnus-backlog-remove-oldest-article))
 	(push ident gnus-backlog-articles)
 	;; Insert the new article.
-	(save-excursion
-	  (set-buffer (gnus-backlog-buffer))
+	(with-current-buffer (gnus-backlog-buffer)
 	  (let (buffer-read-only)
 	    (goto-char (point-max))
 	    (unless (bolp)
@@ -92,8 +87,7 @@
 	      (gnus-error 3 "Article %d is blank" number))))))))
 
 (defun gnus-backlog-remove-oldest-article ()
-  (save-excursion
-    (set-buffer (gnus-backlog-buffer))
+  (with-current-buffer (gnus-backlog-buffer)
     (goto-char (point-min))
     (if (zerop (buffer-size))
 	()				; The buffer is empty.
@@ -116,8 +110,7 @@
 	  beg end)
       (when (memq ident gnus-backlog-articles)
 	;; It was in the backlog.
-	(save-excursion
-	  (set-buffer (gnus-backlog-buffer))
+	(with-current-buffer (gnus-backlog-buffer)
 	  (let (buffer-read-only)
 	    (when (setq beg (text-property-any
 			     (point-min) (point-max) 'gnus-backlog
@@ -133,15 +126,14 @@
 
 (defun gnus-backlog-request-article (group number &optional buffer)
   (when (and (numberp number)
-	     (not (string-match "^nnvirtual" group)))
+	     (not (gnus-virtual-group-p group)))
     (gnus-backlog-setup)
     (let ((ident (intern (concat group ":" (int-to-string number))
 			 gnus-backlog-hashtb))
 	  beg end)
       (when (memq ident gnus-backlog-articles)
 	;; It was in the backlog.
-	(save-excursion
-	  (set-buffer (gnus-backlog-buffer))
+	(with-current-buffer (gnus-backlog-buffer)
 	  (if (not (setq beg (text-property-any
 			      (point-min) (point-max) 'gnus-backlog
 			      ident)))
@@ -152,8 +144,7 @@
 	    (setq end
 		  (next-single-property-change
 		   (1+ beg) 'gnus-backlog (current-buffer) (point-max)))))
-	(save-excursion
-	  (and buffer (set-buffer buffer))
+	(with-current-buffer (or (current-buffer) buffer)
 	  (let ((buffer-read-only nil))
 	    (erase-buffer)
 	    (insert-buffer-substring gnus-backlog-buffer beg end)))
@@ -161,5 +152,4 @@
 
 (provide 'gnus-bcklg)
 
-;;; arch-tag: 66259e56-505a-4bba-8a0d-3552c5b94e39
 ;;; gnus-bcklg.el ends here