* lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): Use force-same-window.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53cf4b8685dfa5a1457096abf0bc6c48ddb28f48..e9e653c5d7b89bb6966a7ccfa965f6adbdf54695 100644 (file)
--- 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 4915cb9bf7f26a03c927cc043d1daaf2090495a9..ea739ea726a2a3646529dc5cf5e446c2c4ae045c 100644 (file)
--- 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)