branch: elpa/magit
commit b93aee2482e848f6b20dc5ecaed5292cd3118e84
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-diff-visit-file--internal: Partially respect DISPLAY for directory
Previously we passed along the wrong variable. If DISPLAY is non-nil,
`magit-diff-visit-directory' displays in another window. When it is
`switch-to-buffer-other-frame', that isn't quite what the user asked
for but it is better to even use the same window and given that
`magit-diff-visit-directory' does not currently support using another
frame, that is the best we can do.
---
lisp/magit-diff.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 075924e5639..e35fec61bf9 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -1706,7 +1706,7 @@ how the buffer is displayed. If nil display in the same
window, if
t display in another window, or if a function, use that to display."
(let ((file (magit-diff--file-at-point t t)))
(if (file-accessible-directory-p file)
- (magit-diff-visit-directory file force-worktree)
+ (magit-diff-visit-directory file display)
(pcase-let ((`(,buf ,pos)
(magit-diff-visit-file--noselect force-worktree)))
(pcase display