]> git.eshelyaron.com Git - emacs.git/commitdiff
Make ediff-set-difference into obsolete alias for seq-difference
authorStefan Kangas <stefan@marxist.se>
Fri, 17 Sep 2021 09:02:38 +0000 (11:02 +0200)
committerStefan Kangas <stefan@marxist.se>
Fri, 17 Sep 2021 09:05:09 +0000 (11:05 +0200)
* lisp/vc/ediff-util.el (ediff-set-difference): Make into obsolete
function alias for 'seq-difference'.
* lisp/vc/ediff-mult.el (ediff-intersect-directories): Update single caller.

lisp/vc/ediff-mult.el
lisp/vc/ediff-util.el

index 3ad1c30c01e0e0e0df3ae5db300e9b42f24de7b0..cfb58349eb85ea38e6d4b907f54c08cd5e19b7ea 100644 (file)
@@ -622,7 +622,7 @@ behavior."
     (setq common (sort (copy-sequence common) #'string-lessp))
 
     ;; compute difference list
-    (setq difflist (ediff-set-difference
+    (setq difflist (seq-difference
                     (seq-union (seq-union lis1 lis2 #'string=)
                                lis3
                                #'string=)
index 7aae70fab4f60c9cd0eeb02d5d543df69c61511b..a6f96b6e840d05fa08c90e7ddfbbfef339364312 100644 (file)
@@ -4151,20 +4151,11 @@ Mail anyway? (y or n) ")
        (key-description desc)
       (format "M-x %s" func-def))))
 
-;; eliminates duplicates using comparison-func
-(defun ediff-set-difference (lis1 lis2 comparison-func)
-  (let ((result (list 'a)))
-    (while lis1
-      (or (ediff-member (car lis1) (cdr result) comparison-func)
-         (ediff-member (car lis1) lis2 comparison-func)
-         (nconc result (list (car lis1))))
-      (setq lis1 (cdr lis1)))
-    (cdr result)))
-
 (define-obsolete-function-alias 'ediff-add-to-history #'add-to-history "27.1")
 (define-obsolete-function-alias 'ediff-copy-list #'copy-sequence "28.1")
 (define-obsolete-function-alias 'ediff-union #'seq-union "28.1")
 (define-obsolete-function-alias 'ediff-intersection #'seq-intersection "28.1")
+(define-obsolete-function-alias 'ediff-set-difference #'seq-difference "28.1")
 
 (run-hooks 'ediff-load-hook)