Mercurial > emacs
changeset 108695:136a119bc981
* vc-dir.el (vc-dir): Don't pop-up-windows. (Bug#6204)
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 18 May 2010 20:01:24 -0700 |
| parents | b27c565c6f1a |
| children | 144e6ea330f0 |
| files | lisp/ChangeLog lisp/vc-dir.el |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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'.