Fix up some byte-compiler warnings.

* lisp/gnus/gnus.el (gnus-group-find-parameter, gnus-kill-save-kill-buffer):
* lisp/gnus/gnus-cite.el (gnus-article-highlight-citation, gnus-dissect-cited-text)
(gnus-article-fill-cited-article, gnus-article-hide-citation)
(gnus-article-hide-citation-in-followups, gnus-cite-toggle):
* lisp/gnus/gnus-group.el (gnus-group-set-mode-line, gnus-group-quit)
(gnus-group-set-info, gnus-add-mark): Use with-current-buffer.
(gnus-group-update-group): Use save-excursion and with-current-buffer.

4 files changed, 139 insertions, 149 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 16c90ac61e8..a1c33b09815 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Fix up some byte-compiler warnings.
+        * gnus.el (gnus-group-find-parameter, gnus-kill-save-kill-buffer):
+        * gnus-cite.el (gnus-article-highlight-citation, gnus-dissect-cited-text)
+        (gnus-article-fill-cited-article, gnus-article-hide-citation)
+        (gnus-article-hide-citation-in-followups, gnus-cite-toggle):
+        * gnus-group.el (gnus-group-set-mode-line, gnus-group-quit)
+        (gnus-group-set-info, gnus-add-mark): Use with-current-buffer.
+        (gnus-group-update-group): Use save-excursion and with-current-buffer.
+
 2010-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-html.el (gnus-article-html): Decode contents by charset.
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index 9502bd819cc..ebc84b6e0b6 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -407,9 +407,7 @@ lines matches `message-cite-prefix-regexp' with the same prefix.
 Lines matching `gnus-cite-attribution-suffix' and perhaps
 `gnus-cite-attribution-prefix' are considered attribution lines."
   (interactive (list 'force))
-  (save-excursion
-    (unless same-buffer
-      (set-buffer gnus-article-buffer))
+  (with-current-buffer (if same-buffer (current-buffer) gnus-article-buffer)
     (gnus-cite-parse-maybe force)
     (let ((buffer-read-only nil)
           (alist gnus-cite-prefix-alist)
@@ -462,8 +460,7 @@ Lines matching `gnus-cite-attribution-suffix' and perhaps
 
 (defun gnus-dissect-cited-text ()
   "Dissect the article buffer looking for cited text."
-  (save-excursion
-    (set-buffer gnus-article-buffer)
+  (with-current-buffer gnus-article-buffer
     (gnus-cite-parse-maybe nil t)
     (let ((alist gnus-cite-prefix-alist)
           prefix numbers number marks m)
@@ -523,8 +520,7 @@ Lines matching `gnus-cite-attribution-suffix' and perhaps
   "Do word wrapping in the current article.
 If WIDTH (the numerical prefix), use that text width when filling."
   (interactive (list t current-prefix-arg))
-  (save-excursion
-    (set-buffer gnus-article-buffer)
+  (with-current-buffer gnus-article-buffer
     (let ((buffer-read-only nil)
           (inhibit-point-motion-hooks t)
           (marks (gnus-dissect-cited-text))
@@ -578,67 +574,66 @@ always hide."
   (interactive (append (gnus-article-hidden-arg) (list 'force)))
   (gnus-set-format 'cited-opened-text-button t)
   (gnus-set-format 'cited-closed-text-button t)
-  (save-excursion
-    (set-buffer gnus-article-buffer)
-      (let ((buffer-read-only nil)
-            marks
-            (inhibit-point-motion-hooks t)
-            (props (nconc (list 'article-type 'cite)
-                          gnus-hidden-properties))
-            (point (point-min))
-            found beg end start)
-        (while (setq point
-                     (text-property-any point (point-max)
-                                        'gnus-callback
-                                        'gnus-article-toggle-cited-text))
-          (setq found t)
-          (goto-char point)
-          (gnus-article-toggle-cited-text
-           (get-text-property point 'gnus-data) arg)
-          (forward-line 1)
-          (setq point (point)))
-        (unless found
-          (setq marks (gnus-dissect-cited-text))
-          (while marks
-            (setq beg nil
-                  end nil)
-            (while (and marks (string= (cdar marks) ""))
-              (setq marks (cdr marks)))
-            (when marks
-              (setq beg (caar marks)))
-            (while (and marks (not (string= (cdar marks) "")))
-              (setq marks (cdr marks)))
-            (when marks
+  (with-current-buffer gnus-article-buffer
+    (let ((buffer-read-only nil)
+          marks
+          (inhibit-point-motion-hooks t)
+          (props (nconc (list 'article-type 'cite)
+                        gnus-hidden-properties))
+          (point (point-min))
+          found beg end start)
+      (while (setq point
+                   (text-property-any point (point-max)
+                                      'gnus-callback
+                                      'gnus-article-toggle-cited-text))
+        (setq found t)
+        (goto-char point)
+        (gnus-article-toggle-cited-text
+         (get-text-property point 'gnus-data) arg)
+        (forward-line 1)
+        (setq point (point)))
+      (unless found
+        (setq marks (gnus-dissect-cited-text))
+        (while marks
+          (setq beg nil
+                end nil)
+          (while (and marks (string= (cdar marks) ""))
+            (setq marks (cdr marks)))
+          (when marks
+            (setq beg (caar marks)))
+          (while (and marks (not (string= (cdar marks) "")))
+            (setq marks (cdr marks)))
+          (when marks
             (setq end (caar marks)))
-            ;; Skip past lines we want to leave visible.
-            (when (and beg end gnus-cited-lines-visible)
-              (goto-char beg)
-              (forward-line (if (consp gnus-cited-lines-visible)
-                                (car gnus-cited-lines-visible)
-                              gnus-cited-lines-visible))
-              (if (>= (point) end)
-                  (setq beg nil)
-                (setq beg (point-marker))
-                (when (consp gnus-cited-lines-visible)
-                  (goto-char end)
-                  (forward-line (- (cdr gnus-cited-lines-visible)))
-                  (if (<= (point) beg)
-                      (setq beg nil)
+          ;; Skip past lines we want to leave visible.
+          (when (and beg end gnus-cited-lines-visible)
+            (goto-char beg)
+            (forward-line (if (consp gnus-cited-lines-visible)
+                              (car gnus-cited-lines-visible)
+                            gnus-cited-lines-visible))
+            (if (>= (point) end)
+                (setq beg nil)
+              (setq beg (point-marker))
+              (when (consp gnus-cited-lines-visible)
+                (goto-char end)
+                (forward-line (- (cdr gnus-cited-lines-visible)))
+                (if (<= (point) beg)
+                    (setq beg nil)
                   (setq end (point-marker))))))
-            (when (and beg end)
-              (gnus-add-wash-type 'cite)
-              ;; We use markers for the end-points to facilitate later
-              ;; wrapping and mangling of text.
-              (setq beg (set-marker (make-marker) beg)
-                    end (set-marker (make-marker) end))
-              (gnus-add-text-properties-when 'article-type nil beg end props)
-              (goto-char beg)
-              (when (and gnus-cite-blank-line-after-header
-                         (not (save-excursion (search-backward "\n\n" nil t))))
-                (insert "\n"))
-              (put-text-property
-               (setq start (point-marker))
-               (progn
+          (when (and beg end)
+            (gnus-add-wash-type 'cite)
+            ;; We use markers for the end-points to facilitate later
+            ;; wrapping and mangling of text.
+            (setq beg (set-marker (make-marker) beg)
+                  end (set-marker (make-marker) end))
+            (gnus-add-text-properties-when 'article-type nil beg end props)
+            (goto-char beg)
+            (when (and gnus-cite-blank-line-after-header
+                       (not (save-excursion (search-backward "\n\n" nil t))))
+              (insert "\n"))
+            (put-text-property
+             (setq start (point-marker))
+             (progn
                (gnus-article-add-button
                 (point)
                 (progn (eval gnus-cited-closed-text-button-line-format-spec)
@@ -646,8 +641,8 @@ always hide."
                 `gnus-article-toggle-cited-text
                 (list (cons beg end) start))
                (point))
-               'article-type 'annotation)
-              (set-marker beg (point))))))))
+             'article-type 'annotation)
+            (set-marker beg (point))))))))
 
 (defun gnus-article-toggle-cited-text (args &optional arg)
   "Toggle hiding the text in REGION.
@@ -750,11 +745,9 @@ See also the documentation for `gnus-article-highlight-citation'."
 (defun gnus-article-hide-citation-in-followups ()
   "Hide cited text in non-root articles."
   (interactive)
-  (save-excursion
-    (set-buffer gnus-article-buffer)
+  (with-current-buffer gnus-article-buffer
     (let ((article (cdr gnus-article-current)))
-      (unless (save-excursion
-                (set-buffer gnus-summary-buffer)
+      (unless (with-current-buffer gnus-summary-buffer
                 (gnus-article-displayed-root-p article))
         (gnus-article-hide-citation)))))
 
@@ -1097,8 +1090,7 @@ See also the documentation for `gnus-article-highlight-citation'."
           (gnus-overlay-put overlay 'face face))))))
 
 (defun gnus-cite-toggle (prefix)
-  (save-excursion
-    (set-buffer gnus-article-buffer)
+  (with-current-buffer gnus-article-buffer
     (gnus-cite-parse-maybe nil t)
     (let ((buffer-read-only nil)
           (numbers (cdr (assoc prefix gnus-cite-prefix-alist)))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index e4758fadb85..b12d76b4618 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1691,72 +1691,66 @@ if it is a string, only list groups matching REGEXP."
   "Update all lines where GROUP appear.
 If VISIBLE-ONLY is non-nil, the group won't be displayed if it isn't
 already."
-  ;; Can't use `save-excursion' here, so we do it manually.
-  (let ((buf (current-buffer))
-        mark)
-    (set-buffer gnus-group-buffer)
-    (setq mark (point-marker))
-    ;; The buffer may be narrowed.
-    (save-restriction
-      (widen)
-      (let ((ident (gnus-intern-safe group gnus-active-hashtb))
-            (loc (point-min))
-            found buffer-read-only)
-        ;; Enter the current status into the dribble buffer.
-        (let ((entry (gnus-group-entry group)))
-          (when (and entry
-                     (not (gnus-ephemeral-group-p group)))
-            (gnus-dribble-enter
-             (concat "(gnus-group-set-info '"
-                     (gnus-prin1-to-string (nth 2 entry))
-                     ")"))))
-        ;; Find all group instances.  If topics are in use, each group
-        ;; may be listed in more than once.
-        (while (setq loc (text-property-any
-                          loc (point-max) 'gnus-group ident))
-          (setq found t)
-          (goto-char loc)
-          (let ((gnus-group-indentation (gnus-group-group-indentation)))
-            (gnus-delete-line)
-            (gnus-group-insert-group-line-info group)
-            (save-excursion
-              (forward-line -1)
-              (gnus-run-hooks 'gnus-group-update-group-hook)))
-          (setq loc (1+ loc)))
-        (unless (or found visible-only)
-          ;; No such line in the buffer, find out where it's supposed to
-          ;; go, and insert it there (or at the end of the buffer).
-          (if gnus-goto-missing-group-function
-              (funcall gnus-goto-missing-group-function group)
-            (let ((entry (cddr (gnus-group-entry group))))
-              (while (and entry (car entry)
-                          (not
-                           (gnus-goto-char
-                            (text-property-any
-                             (point-min) (point-max)
-                             'gnus-group (gnus-intern-safe
-                                          (caar entry) gnus-active-hashtb)))))
-                (setq entry (cdr entry)))
-              (or entry (goto-char (point-max)))))
-          ;; Finally insert the line.
-          (let ((gnus-group-indentation (gnus-group-group-indentation)))
-            (gnus-group-insert-group-line-info group)
-            (save-excursion
-              (forward-line -1)
-              (gnus-run-hooks 'gnus-group-update-group-hook))))
-        (when gnus-group-update-group-function
-          (funcall gnus-group-update-group-function group))
-        (gnus-group-set-mode-line)))
-    (goto-char mark)
-    (set-marker mark nil)
-    (set-buffer buf)))
+  (with-current-buffer gnus-group-buffer
+    (save-excursion
+      ;; The buffer may be narrowed.
+      (save-restriction
+        (widen)
+        (let ((ident (gnus-intern-safe group gnus-active-hashtb))
+              (loc (point-min))
+              found buffer-read-only)
+          ;; Enter the current status into the dribble buffer.
+          (let ((entry (gnus-group-entry group)))
+            (when (and entry
+                       (not (gnus-ephemeral-group-p group)))
+              (gnus-dribble-enter
+               (concat "(gnus-group-set-info '"
+                       (gnus-prin1-to-string (nth 2 entry))
+                       ")"))))
+          ;; Find all group instances.  If topics are in use, each group
+          ;; may be listed in more than once.
+          (while (setq loc (text-property-any
+                            loc (point-max) 'gnus-group ident))
+            (setq found t)
+            (goto-char loc)
+            (let ((gnus-group-indentation (gnus-group-group-indentation)))
+              (gnus-delete-line)
+              (gnus-group-insert-group-line-info group)
+              (save-excursion
+                (forward-line -1)
+                (gnus-run-hooks 'gnus-group-update-group-hook)))
+            (setq loc (1+ loc)))
+          (unless (or found visible-only)
+            ;; No such line in the buffer, find out where it's supposed to
+            ;; go, and insert it there (or at the end of the buffer).
+            (if gnus-goto-missing-group-function
+                (funcall gnus-goto-missing-group-function group)
+              (let ((entry (cddr (gnus-group-entry group))))
+                (while (and entry (car entry)
+                            (not
+                             (gnus-goto-char
+                              (text-property-any
+                               (point-min) (point-max)
+                               'gnus-group (gnus-intern-safe
+                                            (caar entry)
+                                            gnus-active-hashtb)))))
+                  (setq entry (cdr entry)))
+                (or entry (goto-char (point-max)))))
+            ;; Finally insert the line.
+            (let ((gnus-group-indentation (gnus-group-group-indentation)))
+              (gnus-group-insert-group-line-info group)
+              (save-excursion
+                (forward-line -1)
+                (gnus-run-hooks 'gnus-group-update-group-hook))))
+          (when gnus-group-update-group-function
+            (funcall gnus-group-update-group-function group))
+          (gnus-group-set-mode-line))))))
 
 (defun gnus-group-set-mode-line ()
   "Update the mode line in the group buffer."
   (when (memq 'group gnus-updated-mode-lines)
     ;; Yes, we want to keep this mode line updated.
-    (save-excursion
-      (set-buffer gnus-group-buffer)
+    (with-current-buffer gnus-group-buffer
       (let* ((gformat (or gnus-group-mode-line-format-spec
                           (gnus-set-format 'group-mode)))
              (gnus-tmp-news-server (cadr gnus-select-method))
@@ -1769,8 +1763,7 @@ already."
               (and gnus-dribble-buffer
                    (buffer-name gnus-dribble-buffer)
                    (buffer-modified-p gnus-dribble-buffer)
-                   (save-excursion
-                     (set-buffer gnus-dribble-buffer)
+                   (with-current-buffer gnus-dribble-buffer
                      (not (zerop (buffer-size))))))
              (mode-string (eval gformat)))
         ;; Say whether the dribble buffer has been modified.
@@ -4433,8 +4426,7 @@ The hook `gnus-exit-gnus-hook' is called before actually exiting."
     (gnus-run-hooks 'gnus-exit-gnus-hook)
     (gnus-configure-windows 'group t)
     (when (and (gnus-buffer-live-p gnus-dribble-buffer)
-               (not (zerop (save-excursion
-                            (set-buffer gnus-dribble-buffer)
+               (not (zerop (with-current-buffer gnus-dribble-buffer
                             (buffer-size)))))
       (gnus-dribble-enter
        ";;; Gnus was exited on purpose without saving the .newsrc files."))
@@ -4495,13 +4487,11 @@ and the second element is the address."
           (setcar (nthcdr (1- total) info) part-info)))
       (unless entry
         ;; This is a new group, so we just create it.
-        (save-excursion
-          (set-buffer gnus-group-buffer)
+        (with-current-buffer gnus-group-buffer
           (setq method (gnus-info-method info))
           (when (gnus-server-equal method "native")
             (setq method nil))
-          (save-excursion
-            (set-buffer gnus-group-buffer)
+          (with-current-buffer gnus-group-buffer
             (if method
                 ;; It's a foreign group...
                 (gnus-group-make-group
@@ -4565,8 +4555,7 @@ and the second element is the address."
   "Mark ARTICLE in GROUP with MARK, whether the group is displayed or not."
   (let ((buffer (gnus-summary-buffer-name group)))
     (if (gnus-buffer-live-p buffer)
-        (save-excursion
-          (set-buffer (get-buffer buffer))
+        (with-current-buffer (get-buffer buffer)
           (gnus-summary-add-mark article mark))
       (gnus-add-marked-articles group (cdr (assq mark gnus-article-mark-lists))
                                 (list article)))))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index dece8dccece..b3752506c8f 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3937,8 +3937,7 @@ If SYMBOL, return the value of that symbol in the group parameters.
 
 If you call this function inside a loop, consider using the faster
 `gnus-group-fast-parameter' instead."
-  (save-excursion
-    (set-buffer gnus-group-buffer)
+  (with-current-buffer gnus-group-buffer
     (if symbol
         (gnus-group-fast-parameter group symbol allow-list)
       (nconc
@@ -4097,8 +4096,7 @@ Returns the number of articles marked as read."
 (defun gnus-kill-save-kill-buffer ()
   (let ((file (gnus-newsgroup-kill-file gnus-newsgroup-name)))
     (when (get-file-buffer file)
-      (save-excursion
-        (set-buffer (get-file-buffer file))
+      (with-current-buffer (get-file-buffer file)
         (when (buffer-modified-p)
           (save-buffer))
         (kill-buffer (current-buffer))))))