[Emacs-diffs] /srv/bzr/emacs/trunk r100363: * vc-dir.el (vc-dir): Don't pop-up-windows. (Bug#6204)

[Glenn Morris]

------------------------------------------------------------
revno: 100363
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-05-18 20:01:24 -0700
message:
  * vc-dir.el (vc-dir): Don't pop-up-windows.  (Bug#6204)
modified:
  lisp/ChangeLog
  lisp/vc-dir.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-19 01:16:01 +0000
+++ b/lisp/ChangeLog    2010-05-19 03:01:24 +0000
@@ -1,8 +1,11 @@
+2010-05-19  Glenn Morris  <address@hidden>
+
+       * vc-dir.el (vc-dir): Don't pop-up-windows.  (Bug#6204)
+
 2010-05-19  Kenichi Handa  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/vc-dir.el'
--- a/lisp/vc-dir.el    2010-04-20 18:52:07 +0000
+++ b/lisp/vc-dir.el    2010-05-19 03:01:24 +0000
@@ -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'.