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

selected frame.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d2516d4062ea736cd98e6fecc9b3231b07a2287..767f8d0c376c64dfc66dcaa99489a8bc377d6031 100644 (file)
--- 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 c88143f7ca1ef9f99c967605b66dc5ecf53af4dd..90adaace1569b0487744596c08329b00a78bf31b 100644 (file)
--- 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))