summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-11-20 15:17:46 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2011-11-20 15:17:46 -0500
commit7978747fecf51f985fb9b35092b2a3fd412a9a50 (patch)
tree571fbc152166d04493f9c57942e19a73d5672430
parentb0d15b4f051853e76f6831886a4ad5f79cec4b46 (diff)
downloademacs-7978747fecf51f985fb9b35092b2a3fd412a9a50.tar.gz
* lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): Use force-same-window.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/pcvs-util.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53cf4b8685d..e9e653c5d7b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): Use force-same-window.
+
2011-11-20 Juanma Barranquero <lekktu@gmail.com>
* descr-text.el (describe-char-unicode-data):
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index 4915cb9bf7f..ea739ea726a 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -89,7 +89,7 @@ try to split a new window instead."
(or (let ((buf (get-buffer-window buf))) (and buf (select-window buf)))
(and pop-up-windows
(ignore-errors (select-window (split-window-below)))
- (switch-to-buffer buf))
+ (switch-to-buffer buf nil 'force-same-window))
(pop-to-buffer (current-buffer)))))
(defun cvs-bury-buffer (buf &optional mainbuf)