branch: elpa/magit
commit 502521dc45aab7556d7214e66c81a897f7440064
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Use ## and seq-remove instead of --remove
---
lisp/magit-apply.el | 4 ++--
lisp/magit-git.el | 6 +++---
lisp/magit-log.el | 4 ++--
lisp/magit-sequence.el | 2 +-
lisp/magit-subtree.el | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index f521d950162..29a3babecd6 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -695,8 +695,8 @@ of a side, then keep that side without prompting."
(let ((binaries (magit-binary-files "--cached")))
(when binaries
(setq sections
- (--remove (member (oref it value) binaries)
- sections)))
+ (seq-remove (##member (oref % value) binaries)
+ sections)))
(cond ((length= sections 1)
(magit-discard-apply (car sections) 'magit-apply-diff))
(sections
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index b7779c6b369..ea3e5f05e8f 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -1941,9 +1941,9 @@ SORTBY is a key or list of keys to pass to the `--sort'
flag of
(magit-list-refs (concat "refs/remotes/" remote)))
(defun magit-list-related-branches (relation &optional commit &rest args)
- (--remove (string-match-p "\\(\\`(HEAD\\|HEAD -> \\)" it)
- (mapcar (##substring % 2)
- (magit-git-lines "branch" args relation commit))))
+ (seq-remove (##string-match-p "\\(\\`(HEAD\\|HEAD -> \\)" %)
+ (mapcar (##substring % 2)
+ (magit-git-lines "branch" args relation commit))))
(defun magit-list-containing-branches (&optional commit &rest args)
(magit-list-related-branches "--contains" commit args))
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index e62a1a19ce2..ac17b7b2c5e 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -1933,8 +1933,8 @@ Show the last `magit-log-section-commit-count' commits."
(magit--insert-log nil
(and (member "--graph" magit-buffer-log-args) range)
(cons (format "-n%d" magit-log-section-commit-count)
- (--remove (string-prefix-p "-n" it)
- magit-buffer-log-args))))))
+ (seq-remove (##string-prefix-p "-n" %)
+ magit-buffer-log-args))))))
(magit-define-section-jumper magit-jump-to-unpushed-to-pushremote
"Unpushed to <push-remote>" unpushed "@{push}.."
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 9f0eec8245a..2dc40fb2b69 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -343,7 +343,7 @@ the process manually."
(let ((merges (seq-filter #'magit-merge-commit-p commits)))
(cond
((not merges)
- (--remove (string-prefix-p "--mainline=" it) args))
+ (seq-remove (##string-prefix-p "--mainline=" %) args))
((cl-set-difference commits merges :test #'equal)
(user-error "Cannot %s merge and non-merge commits at once"
command))
diff --git a/lisp/magit-subtree.el b/lisp/magit-subtree.el
index a46e5967899..c8758f3145b 100644
--- a/lisp/magit-subtree.el
+++ b/lisp/magit-subtree.el
@@ -113,8 +113,8 @@
(magit-subtree-read-prefix prompt)))
(defun magit-subtree-arguments (transient)
- (--remove (string-prefix-p "--prefix=" it)
- (transient-args transient)))
+ (seq-remove (##string-prefix-p "--prefix=" %)
+ (transient-args transient)))
(defun magit-git-subtree (subcmd prefix &rest args)
(magit-run-git-async "subtree" subcmd (concat "--prefix=" prefix) args))
