Mercurial > emacs

diff lisp/vc-dir.el @ 108704:912915c9edd9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 19 May 2010 22:54:44 +0000
parents 136a119bc981
children 46a99dfe8970
line wrap: on
line diff
--- a/lisp/vc-dir.el	Tue May 18 23:23:58 2010 +0000
+++ b/lisp/vc-dir.el	Wed May 19 22:54:44 2010 +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'.