From: Andreas Schwab <schwab@suse.de>
Date: Sun, 20 Apr 2008 08:32:11 +0000 (+0000)
Subject: (server-switch-buffer): Also consider clients in the
X-Git-Tag: emacs-pretest-23.0.90~6176
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a7ce6c7f5d954f3bcfa72eb45ef523c9a4823f67;p=emacs.git

(server-switch-buffer): Also consider clients in the
selected frame.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d2516d4062..767f8d0c376 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-20  Andreas Schwab  <schwab@suse.de>
+
+	* server.el (server-switch-buffer): Also consider clients in the
+	selected frame.
+
 2008-04-19  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdb-mouse-set-clear-breakpoint): Select
diff --git a/lisp/server.el b/lisp/server.el
index c88143f7ca1..90adaace156 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1220,8 +1220,10 @@ done that."
 	(let ((rest server-clients))
 	  (while (and rest (not next-buffer))
 	    (let ((proc (car rest)))
-	      ;; Only look at frameless clients.
-	      (when (not (process-get proc 'frame))
+	      ;; Only look at frameless clients, or those in the selected
+	      ;; frame.
+	      (when (or (not (process-get proc 'frame))
+			(eq (process-get proc 'frame) (selected-frame)))
 		(setq next-buffer (car (process-get proc 'buffers))))
 	      (setq rest (cdr rest)))))
 	(and next-buffer (server-switch-buffer next-buffer killed-one))