(gnus-enter-server-buffer): Make sure the server-buffer

is current before calling gnus-server-prepare.
(gnus-server-setup-buffer, gnus-server-update-server)
(gnus-server-read-server, gnus-browse-exit): Use with-current-buffer.

1 files changed, 10 insertions, 9 deletions

diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index d8dead40172..8cbde941692 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -284,13 +284,17 @@ The following commands are available:
   "Set up the server buffer."
   (gnus-server-setup-buffer)
   (gnus-configure-windows 'server)
-  (gnus-server-prepare))
+  ;; Usually `gnus-configure-windows' will finish with the
+  ;; `gnus-server-buffer' selected as the current buffer, but not always (I
+  ;; bumped into it when starting from a dedicated *Group* frame, and
+  ;; gnus-configure-windows opened *Server* into its own dedicated frame).
+  (with-current-buffer (get-buffer gnus-server-buffer)
+    (gnus-server-prepare)))
 
 (defun gnus-server-setup-buffer ()
   "Initialize the server buffer."
   (unless (get-buffer gnus-server-buffer)
-    (save-excursion
-      (set-buffer (gnus-get-buffer-create gnus-server-buffer))
+    (with-current-buffer (gnus-get-buffer-create gnus-server-buffer)
       (gnus-server-mode)
       (when gnus-carpal
 	(gnus-carpal-setup-buffer 'server)))))
@@ -341,8 +345,7 @@ The following commands are available:
 (defconst gnus-server-edit-buffer "*Gnus edit server*")
 
 (defun gnus-server-update-server (server)
-  (save-excursion
-    (set-buffer gnus-server-buffer)
+  (with-current-buffer gnus-server-buffer
     (let* ((buffer-read-only nil)
 	   (entry (assoc server gnus-server-alist))
 	   (oentry (assoc (gnus-server-to-method server)
@@ -618,8 +621,7 @@ The following commands are available:
   (let ((buf (current-buffer)))
     (prog1
 	(gnus-browse-foreign-server server buf)
-      (save-excursion
-	(set-buffer buf)
+      (with-current-buffer buf
 	(gnus-server-update-server (gnus-server-server-name))
 	(gnus-server-position-point)))))
 
@@ -960,8 +962,7 @@ If NUMBER, fetch this number of articles."
   (when (eq major-mode 'gnus-browse-mode)
     (gnus-kill-buffer (current-buffer)))
   ;; Insert the newly subscribed groups in the group buffer.
-  (save-excursion
-    (set-buffer gnus-group-buffer)
+  (with-current-buffer gnus-group-buffer
     (gnus-group-list-groups nil))
   (if gnus-browse-return-buffer
       (gnus-configure-windows 'server 'force)