diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-09-17 10:41:15 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-09-17 11:05:06 +0200 |
| commit | fb9df9b8834b795c8dd387e61df0a9dfded11dfc (patch) | |
| tree | dc6907b89540f31a39fdecfd1c3834cd16f3fc6c /lisp/vc/ediff-util.el | |
| parent | 0cf0a2b98671671bb7639a17639ef2552b772cbe (diff) | |
| download | emacs-fb9df9b8834b795c8dd387e61df0a9dfded11dfc.tar.gz emacs-fb9df9b8834b795c8dd387e61df0a9dfded11dfc.tar.bz2 emacs-fb9df9b8834b795c8dd387e61df0a9dfded11dfc.zip | |
Make ediff-union into obsolete alias for seq-union
* lisp/emacs-lisp/seq.el (seq-union): Autoload.
* lisp/vc/ediff-util.el (ediff-union): Make into obsolete function
alias for 'seq-union'.
* lisp/vc/ediff-mult.el (ediff-intersect-directories): Update single
caller.
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | lisp/vc/ediff-util.el | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 04043809436..0ae2f09ccdc 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -4161,20 +4161,6 @@ Mail anyway? (y or n) ") (setq lis1 (cdr lis1))) (cdr result))) - -;; eliminates duplicates using comparison-func -(defun ediff-union (lis1 lis2 comparison-func) - (let ((result (list 'a))) - (while lis1 - (or (ediff-member (car lis1) (cdr result) comparison-func) - (nconc result (list (car lis1)))) - (setq lis1 (cdr lis1))) - (while lis2 - (or (ediff-member (car lis2) (cdr result) comparison-func) - (nconc result (list (car lis2)))) - (setq lis2 (cdr lis2))) - (cdr result))) - ;; eliminates duplicates using comparison-func (defun ediff-set-difference (lis1 lis2 comparison-func) (let ((result (list 'a))) @@ -4187,6 +4173,7 @@ Mail anyway? (y or n) ") (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") (run-hooks 'ediff-load-hook) |