emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 46b8d70 3/5: Make ediff-copy-list alias obsolete


From: Stefan Kangas
Subject: master 46b8d70 3/5: Make ediff-copy-list alias obsolete
Date: Mon, 5 Apr 2021 05:14:59 -0400 (EDT)

branch: master
commit 46b8d7087c8270c92d6a3b94e811de5e3cc99701
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Make ediff-copy-list alias obsolete
    
    * 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.
---
 lisp/vc/ediff-mult.el | 6 +++---
 lisp/vc/ediff-util.el | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 49b2890..8e88b60 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -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
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index fc6dcf6..b538216 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]