# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1208680331 0
# Node ID 89ea665b6e710333d772f778be5e25b190035dd7
# Parent  5132587368a01eb8d2eed9054c1935c5153f6570
(server-switch-buffer): Also consider clients in the
selected frame.

diff -r 5132587368a0 -r 89ea665b6e71 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Apr 19 23:05:21 2008 +0000
+++ b/lisp/ChangeLog	Sun Apr 20 08:32:11 2008 +0000
@@ -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 -r 5132587368a0 -r 89ea665b6e71 lisp/server.el
--- a/lisp/server.el	Sat Apr 19 23:05:21 2008 +0000
+++ b/lisp/server.el	Sun Apr 20 08:32:11 2008 +0000
@@ -1220,8 +1220,10 @@
 	(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))