Fix magit rebase/log windows being hidden by diffs

This commit is contained in:
Henrik Lissner 2018-06-10 17:22:03 +02:00
parent b079db8ec3
commit 383ecf7a08
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -9,15 +9,16 @@
2. The status screen isn't buried when viewing diffs or logs from the status 2. The status screen isn't buried when viewing diffs or logs from the status
screen." screen."
(display-buffer (display-buffer
buffer (cond ((derived-mode-p 'magit-mode) buffer (cond ((or (bound-and-true-p git-commit-mode)
(derived-mode-p 'magit-log-mode))
'(display-buffer-below-selected))
((derived-mode-p 'magit-mode)
(when (eq major-mode 'magit-status-mode) (when (eq major-mode 'magit-status-mode)
(display-buffer-in-side-window (display-buffer-in-side-window
(current-buffer) '((side . left) (current-buffer) '((side . left)
(window-width . 0.35) (window-width . 0.35)
(window-parameters (quit))))) (window-parameters (quit)))))
'(display-buffer-same-window)) '(display-buffer-same-window))
((bound-and-true-p git-commit-mode)
'(display-buffer-below-selected))
((buffer-local-value 'git-commit-mode buffer) ((buffer-local-value 'git-commit-mode buffer)
'(magit--display-buffer-fullframe)) '(magit--display-buffer-fullframe))
((memq (buffer-local-value 'major-mode buffer) ((memq (buffer-local-value 'major-mode buffer)