[Emacs-diffs] /srv/bzr/emacs/trunk r106455: * lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): Use force-same-window.

[Stefan Monnier]

------------------------------------------------------------
revno: 106455
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2011-11-20 15:17:46 -0500
message:
  * lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): Use force-same-window.
modified:
  lisp/ChangeLog
  lisp/vc/pcvs-util.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-20 19:35:27 +0000
+++ b/lisp/ChangeLog    2011-11-20 20:17:46 +0000
@@ -1,3 +1,7 @@
+2011-11-20  Stefan Monnier  <address@hidden>
+
+       * vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): Use force-same-window.
+
 2011-11-20  Juanma Barranquero  <address@hidden>
 
        * descr-text.el (describe-char-unicode-data):

=== modified file 'lisp/vc/pcvs-util.el'
--- a/lisp/vc/pcvs-util.el      2011-11-17 09:09:20 +0000
+++ b/lisp/vc/pcvs-util.el      2011-11-20 20:17:46 +0000
@@ -89,7 +89,7 @@
     (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)