Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make ediff-copy-list alias obsolete

Browse source 
* lisp/vc/ediff-mult.el (ediff-intersect-directories)
(ediff-get-directory-files-under-revision): Don't use above
obsolete alias.
* lisp/vc/ediff-util.el (ediff-copy-list): Make alias obsolete.
This commit is contained in:
Stefan Kangas 2021-04-05 01:38:48 +02:00
parent e9c3d040bc
commit 46b8d7087c
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/vc/ediff-mult.el
View file

@ -620,7 +620,7 @@ behavior."
(setq common (ediff-intersection common lis3 #'string=)))
;; copying is needed because sort sorts via side effects
(setq common (sort (ediff-copy-list common) 'string-lessp))
(setq common (sort (copy-sequence common) #'string-lessp))
;; compute difference list
(setq difflist (ediff-set-difference
@ -631,7 +631,7 @@ behavior."
#'string=)
difflist (delete "." difflist)
;; copying is needed because sort sorts via side effects
difflist (sort (ediff-copy-list (delete ".." difflist))
difflist (sort (copy-sequence (delete ".." difflist))
#'string-lessp))
(setq difflist (mapcar (lambda (elt) (cons elt 1)) difflist))
@ -729,7 +729,7 @@ behavior."
)
;; copying is needed because sort sorts via side effects
(setq common (sort (ediff-copy-list common) 'string-lessp))
(setq common (sort (copy-sequence common) #'string-lessp))
;; return result
(cons

3
lisp/vc/ediff-util.el
View file

@ -4188,8 +4188,7 @@ Mail anyway? (y or n) ")
(cdr result)))
(define-obsolete-function-alias 'ediff-add-to-history #'add-to-history "27.1")
(defalias 'ediff-copy-list 'copy-sequence)
(define-obsolete-function-alias 'ediff-copy-list #'copy-sequence "28.1")
;; don't report error if version control package wasn't found