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

d24e10b1 · Glenn Morris · 38b8b326 · d24e10b1 · d24e10b1
Commit d24e10b1 authored May 18, 2010 by Glenn Morris
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

lisp/ChangeLog lisp/ChangeLog +5 -2

lisp/vc-dir.el lisp/vc-dir.el +2 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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>


--- 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'.