diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-09-17 11:02:38 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-09-17 11:05:09 +0200 |
| commit | 24bd7025618048edef688b812514b921413c49f4 (patch) | |
| tree | befaa229adb4138dfe265fd2e1348c83c1a4b472 | |
| parent | 403010f2fda1a35f6ac40484646bb6708f4319ad (diff) | |
| download | emacs-24bd7025618048edef688b812514b921413c49f4.tar.gz emacs-24bd7025618048edef688b812514b921413c49f4.tar.bz2 emacs-24bd7025618048edef688b812514b921413c49f4.zip | |
Make ediff-set-difference into obsolete alias for seq-difference
* 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.
| -rw-r--r-- | lisp/vc/ediff-mult.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-util.el | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index 3ad1c30c01e..cfb58349eb8 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -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=) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 7aae70fab4f..a6f96b6e840 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -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) |