branch: elpa/magit
commit ced0984540c8c88c833d3534fe4a2ee98eaf9dc8
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-setup-buffer-internal: Use keyword instead of optional arguments
---
lisp/magit-mode.el | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index fb7d3a7f895..8cd998ef4e1 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -634,16 +634,16 @@ The buffer's major-mode should derive from
`magit-section-mode'."
`(list ',var ,form))
bindings))))
-(defun magit-setup-buffer-internal ( mode locked bindings
- &optional buffer-or-name directory)
+(cl-defun magit-setup-buffer-internal ( mode locked bindings
+ &key buffer directory)
(let* ((value (and locked
(with-temp-buffer
(pcase-dolist (`(,var ,val) bindings)
(set (make-local-variable var) val))
(let ((major-mode mode))
(magit-buffer-value)))))
- (buffer (if buffer-or-name
- (get-buffer-create buffer-or-name)
+ (buffer (if buffer
+ (get-buffer-create buffer)
(magit-get-mode-buffer mode value)))
(section (and buffer (magit-current-section)))
(created (not buffer)))
@@ -1395,7 +1395,8 @@ Later, when the buffer is buried, it may be restored by
(when-let ((tail (nthcdr 30 help-xref-stack)))
(setcdr tail nil))
(setq help-xref-stack-item
- (list 'magit-xref-restore fn default-directory args))))
+ (list 'magit-xref-restore fn args
+ :directory default-directory))))
(defun magit-xref-restore (fn dir args)
(setq default-directory dir)
