emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4073 from saep/bugfix/magit--display-buffer-in-direction-doesnt-respect-magit-display-buffer-noselect

Browse source 
Respect magit-display-buffer-noselect
This commit is contained in:
Henrik Lissner 2020-10-10 23:19:06 -04:00 • committed by GitHub
commit 3e2c98a0a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/tools/magit/autoload.el
View file

@ -66,7 +66,8 @@ window that already exists in that direction. It will split otherwise."
+magit-open-windows-in-direction)) +magit-open-windows-in-direction))
(origin-window (selected-window))) (origin-window (selected-window)))
(if-let (window (window-in-direction direction)) (if-let (window (window-in-direction direction))
(select-window window) (unless magit-display-buffer-noselect
(select-window window))
(if-let (window (and (not (one-window-p)) (if-let (window (and (not (one-window-p))
(window-in-direction (window-in-direction
(pcase direction (pcase direction
@ -74,16 +75,19 @@ window that already exists in that direction. It will split otherwise."
(`left 'right) (`left 'right)
((or `up `above) 'down) ((or `up `above) 'down)
((or `down `below) 'up))))) ((or `down `below) 'up)))))
(select-window window) (unless magit-display-buffer-noselect
(select-window window))
(let ((window (split-window nil nil direction))) (let ((window (split-window nil nil direction)))
(when (memq direction '(right down below)) (when (and (not magit-display-buffer-noselect)
(memq direction '(right down below)))
(select-window window)) (select-window window))
(display-buffer-record-window 'reuse window buffer) (display-buffer-record-window 'reuse window buffer)
(set-window-buffer window buffer) (set-window-buffer window buffer)
(set-window-parameter window 'quit-restore (list 'window 'window origin-window buffer)) (set-window-parameter window 'quit-restore (list 'window 'window origin-window buffer))
(set-window-prev-buffers window nil)))) (set-window-prev-buffers window nil))))
(switch-to-buffer buffer t t) (unless magit-display-buffer-noselect
(selected-window))) (switch-to-buffer buffer t t)
(selected-window))))
;; ;;