# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1274238084 25200
# Node ID 136a119bc9818609bbe9afe5aa068781b678595f
# Parent  b27c565c6f1a1f6a3421bcc09196aaa0533dc38e
* vc-dir.el (vc-dir): Don't pop-up-windows.  (Bug#6204)

diff -r b27c565c6f1a -r 136a119bc981 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue May 18 19:56:44 2010 -0700
+++ b/lisp/ChangeLog	Tue May 18 20:01:24 2010 -0700
@@ -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 -r b27c565c6f1a -r 136a119bc981 lisp/vc-dir.el
--- a/lisp/vc-dir.el	Tue May 18 19:56:44 2010 -0700
+++ b/lisp/vc-dir.el	Tue May 18 20:01:24 2010 -0700
@@ -1169,7 +1169,8 @@
 	  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'.