* vc-dir.el (vc-dir): Don't pop-up-windows. (Bug#6204)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 545311d6530b26cd68a52273d463edd601d709e3..8626457166ad91b52701aa7e23c7cd2223d2fe72 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,11 @@
+2010-05-19  Glenn Morris  <rgm@gnu.org>
+
+       * vc-dir.el (vc-dir): Don't pop-up-windows.  (Bug#6204)
+
 2010-05-19  Kenichi Handa  <handa@m17n.org>
 
        * composite.el: Register compose-gstring-for-graphic in
-       composition-function-table only for combining characters (Mn, Mc,
-       Me).
+       composition-function-table only for combining characters (Mn, Mc, Me).
 
 2010-05-18  Jay Belanger  <jay.p.belanger@gmail.com>
 

diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index f24e627de646be4a9d4a01e3560eb13aef8d5b4e..5809110e5b58981801c9aaf441fc31f270827cda 100644 (file)
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -1169,7 +1169,8 @@ These are the commands available for use in the file status buffer:
          nil t nil nil)))))
   (unless backend
     (setq backend (vc-responsible-backend dir)))
-  (pop-to-buffer (vc-dir-prepare-status-buffer "*vc-dir*" dir backend))
+  (let (pop-up-windows)                      ; based on cvs-examine; bug#6204
+    (pop-to-buffer (vc-dir-prepare-status-buffer "*vc-dir*" dir backend)))
   (if (derived-mode-p 'vc-dir-mode)
       (vc-dir-refresh)
     ;; FIXME: find a better way to pass the backend to `vc-dir-mode'.