Merge remote branch 'refs/remotes/vanicat/t/multi-buffer'

This commit is contained in:
Phil Jackson 2010-05-26 18:22:36 +01:00
commit 0f628c37ce

View file

@ -2495,11 +2495,10 @@ insert a line to tell how to insert more of them"
(setq topdir (magit-get-top-dir dir)))) (setq topdir (magit-get-top-dir dir))))
(when topdir (when topdir
(let ((buf (or (magit-find-buffer 'status topdir) (let ((buf (or (magit-find-buffer 'status topdir)
(switch-to-buffer (generate-new-buffer
(get-buffer-create (concat "*magit: "
(concat "*magit: " (file-name-nondirectory
(file-name-nondirectory (directory-file-name topdir)) "*")))))
(directory-file-name topdir)) "*"))))))
(switch-to-buffer buf) (switch-to-buffer buf)
(magit-mode-init topdir 'status #'magit-refresh-status) (magit-mode-init topdir 'status #'magit-refresh-status)
(magit-status-mode t))))) (magit-status-mode t)))))