summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2001-02-22 20:14:45 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2001-02-22 20:14:45 +0000
commit39b557e8919516a28a27badf401d77ba05dead46 (patch)
tree872c8228d432b0247c1e304438f2552656607caa /lisp
parentcb91b2c7eec8e3139734d760c0f3583e9c3b6416 (diff)
downloademacs-39b557e8919516a28a27badf401d77ba05dead46.tar.gz
(server-switch-buffer): Only switch window if the current one is dedicated.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/server.el5
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)