daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

fix magit update

Browse Source
This commit is contained in:
Daniel Weschke
2022-01-27 17:13:55 +01:00
parent 03507476ec
commit b6f0853efe
28 changed files with 13645 additions and 11087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/magit/magit-diff.el
View File

@@ -952,9 +952,9 @@ and `:slant'."
:reader 'magit-read-files
:multi-value t)
(defun magit-read-files (prompt initial-input history)
(defun magit-read-files (prompt initial-input history &optional list-fn)
(magit-completing-read-multiple* prompt
(magit-list-files)
(funcall (or list-fn #'magit-list-files))
nil nil
(or initial-input (magit-file-at-point))
history))
@@ -2058,7 +2058,7 @@ Staging and applying changes is documented in info node
(when (and (not (equal cmd "merge-tree"))
(pcase (magit-repository-local-get 'diff-ita-kludge-p 'unset)
(`unset
(let ((val (version<= "2.19.0" (magit-git-version))))
(let ((val (magit-git-version>= "2.19.0")))
(magit-repository-local-set 'diff-ita-kludge-p val)
val))
(val val)))