branch: elpa/magit
commit e2aecc347c88ee871f73472d122d06a0ddd1e282
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Use ## and -separate instead of --separate
---
lisp/magit-apply.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 29a3babecd6..6dd8d34c7f0 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -703,7 +703,7 @@ of a side, then keep that side without prompting."
(magit-discard-apply-n sections #'magit-apply-diffs)))
(when binaries
(let ((modified (magit-unstaged-files t)))
- (setq binaries (--separate (member it modified) binaries)))
+ (setq binaries (-separate (##member % modified) binaries)))
(when (cadr binaries)
(magit-call-git "reset" "--" (cadr binaries)))
(when (car binaries)
@@ -757,8 +757,8 @@ so causes the change to be applied to the index as well."
magit-buffer-range)
(t
"--cached")))))
- (--separate (member (oref it value) bs)
- sections))))
+ (-separate (##member (oref % value) bs)
+ sections))))
(magit-confirm-files 'reverse (mapcar (##oref % value) sections))
(cond ((length= sections 1)
(magit-reverse-apply (car sections) #'magit-apply-diff args))
