(server-switch-buffer): Only switch window if the current one is dedicated.

2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7856e1a4ebe..59c088f5163 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-22  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * server.el (server-switch-buffer): Only switch window if the
+        current one is dedicated.
+
         * textmodes/fill.el (fill-region-as-paragraph): Skip spaces backward
         rather than using (match-beginning 0) when searching for break point.
 
diff --git a/lisp/server.el b/lisp/server.el
index 1e7d51692cb..54e452f6526 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -507,8 +507,9 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
   (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)