# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 982872824 0
# Node ID eecd47acee5068f99d1a5b93dda1b133488f3c95
# Parent  445e5926f609ec560b702742c9f09c372e4b233e
(server-switch-buffer): Only switch window if the current one is dedicated.

diff -r 445e5926f609 -r eecd47acee50 lisp/server.el
--- a/lisp/server.el	Thu Feb 22 20:09:13 2001 +0000
+++ b/lisp/server.el	Thu Feb 22 20:13:44 2001 +0000
@@ -507,8 +507,9 @@
   (if (window-minibuffer-p (selected-window))
       (select-window (next-window nil 'nomini 0)))
   ;; Move to a non-dedicated window, if we have one.
-  (select-window (some-window (lambda (w) (not (window-dedicated-p w)))
-			      'nomini 'visible (selected-window)))
+  (when (window-dedicated-p (selected-window))
+    (select-window (some-window (lambda (w) (not (window-dedicated-p w)))
+				'nomini 'visible (selected-window))))
   (set-window-dedicated-p (selected-window) nil)
   (if next-buffer
       (if (and (bufferp next-buffer)