Minor edits.

This commit is contained in:
Derek Taylor
2020-11-05 13:27:52 -06:00
parent 8fbacc6392
commit 35112d3f8c
170 changed files with 1304 additions and 756 deletions

View File

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

View File

@@ -112,7 +112,7 @@ For example, diffs and log buffers. Accepts `left', `right', `up', and `down'.")
;; git executable isn't in the exact same location.
(add-hook! 'magit-status-mode-hook
(defun +magit-optimize-process-calls-h ()
(when-let (path (executable-find magit-git-executable))
(when-let (path (executable-find magit-git-executable t))
(setq-local magit-git-executable path)))))

View File

@@ -1,11 +1,11 @@
;; -*- no-byte-compile: t; -*-
;;; tools/magit/packages.el
(when (package! magit :pin "321214c3a2dd10fdf672ba96bd00703a51094bbe")
(when (package! magit :pin "2fb3bf782ccf5652b98f8de989f014749473eacf")
(when (featurep! +forge)
(package! forge :pin "feee7e2fce3f87f7aa113c5edcb1896127ee9d12"))
(package! forge :pin "031e4f06b2bff66375e53ea96f8eb3dfbdf391d9"))
(package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b")
(package! magit-todos :pin "a0e5d1f3c7dfcb4f18c1b0d57f1746a4872df5c6")
(package! github-review :pin "fab440aeae4fbf6a8192fd11795052e9eb5d27d1")
(package! github-review :pin "e2123cce391bfd9d947ba2934b5d655ab1e90b6d")
(when (featurep! :editor evil +everywhere)
(package! evil-magit :pin "88dc26ce59dbf4acb4e2891c79c4bd329553ba56")))