Mercurial > emacs
comparison lisp/vc-dir.el @ 108704:912915c9edd9
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 19 May 2010 22:54:44 +0000 |
parents | 136a119bc981 |
children | 46a99dfe8970 |
comparison
equal
deleted
inserted
replaced
108685:391df511b305 | 108704:912915c9edd9 |
---|---|
1167 (mapcar (lambda (b) (list (symbol-name b))) | 1167 (mapcar (lambda (b) (list (symbol-name b))) |
1168 vc-handled-backends) | 1168 vc-handled-backends) |
1169 nil t nil nil))))) | 1169 nil t nil nil))))) |
1170 (unless backend | 1170 (unless backend |
1171 (setq backend (vc-responsible-backend dir))) | 1171 (setq backend (vc-responsible-backend dir))) |
1172 (pop-to-buffer (vc-dir-prepare-status-buffer "*vc-dir*" dir backend)) | 1172 (let (pop-up-windows) ; based on cvs-examine; bug#6204 |
1173 (pop-to-buffer (vc-dir-prepare-status-buffer "*vc-dir*" dir backend))) | |
1173 (if (derived-mode-p 'vc-dir-mode) | 1174 (if (derived-mode-p 'vc-dir-mode) |
1174 (vc-dir-refresh) | 1175 (vc-dir-refresh) |
1175 ;; FIXME: find a better way to pass the backend to `vc-dir-mode'. | 1176 ;; FIXME: find a better way to pass the backend to `vc-dir-mode'. |
1176 (let ((use-vc-backend backend)) | 1177 (let ((use-vc-backend backend)) |
1177 (vc-dir-mode)))) | 1178 (vc-dir-mode)))) |