diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-04-05 01:38:48 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-04-05 11:14:34 +0200 |
| commit | 46b8d7087c8270c92d6a3b94e811de5e3cc99701 (patch) | |
| tree | ff08a4b6448adcfecee89d0fc7a951b21d38e07c | |
| parent | e9c3d040bcfab5908e6deb7330038f36ce95bc93 (diff) | |
| download | emacs-46b8d7087c8270c92d6a3b94e811de5e3cc99701.tar.gz emacs-46b8d7087c8270c92d6a3b94e811de5e3cc99701.tar.bz2 emacs-46b8d7087c8270c92d6a3b94e811de5e3cc99701.zip | |
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.
| -rw-r--r-- | lisp/vc/ediff-mult.el | 6 | ||||
| -rw-r--r-- | 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 49b2890a160..8e88b60a0bd 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 fc6dcf68a43..b538216f45c 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 |