mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-04 08:47:11 +00:00
Code Issues Releases Activity

Make ediff-set-difference into obsolete alias for seq-difference

Browse Source 
* 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.
This commit is contained in:
Stefan Kangas 2021-09-17 11:02:38 +02:00
parent 403010f2fd
commit 24bd702561
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/vc/ediff-mult.el
View 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=)

11
lisp/vc/ediff-util.el
View 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)