[nongnu] elpa/git-commit 2b82fc2afc 01/15: Use cl-set-difference instead of -difference

[ELPA Syncer]

branch: elpa/git-commit
commit 2b82fc2afc2669e49a790f4aa3d5d24042eabbcf
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    Use cl-set-difference instead of -difference
---
 lisp/magit-branch.el    | 3 ++-
 lisp/magit-patch.el     | 4 +++-
 lisp/magit-tag.el       | 4 ++--
 lisp/magit-transient.el | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el
index 27b819117d..21777d1d6c 100644
--- a/lisp/magit-branch.el
+++ b/lisp/magit-branch.el
@@ -599,7 +599,8 @@ prompt is confusing."
                "Delete %d unmerged branches"
                'noabort unmerged)
              (setq force branches)
-           (or (setq branches (-difference branches unmerged))
+           (or (setq branches
+                     (cl-set-difference branches unmerged :test #'equal))
                (user-error "Abort")))))
      (list branches force)))
   (let* ((refs (mapcar #'magit-ref-fullname branches))
diff --git a/lisp/magit-patch.el b/lisp/magit-patch.el
index 324bd43f20..230a18f845 100644
--- a/lisp/magit-patch.el
+++ b/lisp/magit-patch.el
@@ -294,7 +294,9 @@ same differences as those shown in the buffer are always 
used."
              (setq args nil)))
           ((eq (car-safe magit-patch-save-arguments) 'exclude)
            (unless arg
-             (setq args (-difference args (cdr magit-patch-save-arguments)))))
+             (setq args
+                   (cl-set-difference args (cdr magit-patch-save-arguments)
+                                      :test #'equal))))
           ((not arg)
            (setq args magit-patch-save-arguments)))
     (with-temp-file file
diff --git a/lisp/magit-tag.el b/lisp/magit-tag.el
index a1b004cc7f..be22970299 100644
--- a/lisp/magit-tag.el
+++ b/lisp/magit-tag.el
@@ -95,8 +95,8 @@ defaulting to the tag at point.
           (rtags  (prog2 (message "Determining remote tags...")
                       (magit-remote-list-tags remote)
                     (message "Determining remote tags...done")))
-          (ltags  (-difference tags rtags))
-          (rtags  (-difference rtags tags)))
+          (ltags  (cl-set-difference tags rtags :test #'equal))
+          (rtags  (cl-set-difference rtags tags :test #'equal)))
      (unless (or ltags rtags)
        (message "Same tags exist locally and remotely"))
      (unless (magit-confirm t
diff --git a/lisp/magit-transient.el b/lisp/magit-transient.el
index 7d4fd8c839..6dda38a2a1 100644
--- a/lisp/magit-transient.el
+++ b/lisp/magit-transient.el
@@ -134,9 +134,9 @@
         (seturl   (oref obj seturl-arg))
         (remote   (oref transient--prefix scope)))
     (oset obj value values)
-    (dolist (v (-difference values previous))
+    (dolist (v (cl-set-difference values previous :test #'equal))
       (magit-call-git "remote" "set-url" seturl "--add" remote v))
-    (dolist (v (-difference previous values))
+    (dolist (v (cl-set-difference previous values :test #'equal))
       (magit-call-git "remote" "set-url" seturl "--delete" remote
                       (concat "^" (regexp-quote v) "$")))
     (magit-refresh)))