From 296ba3ee9f7f8d1b9ba0c8dbf0cd8127fd02e9f0 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 12 Jul 2011 09:26:48 +0200 Subject: [PATCH] Remove `remove-duplicates', since `delete-dups' is sufficient. --- lisp/ChangeLog | 6 ++++++ lisp/dired-x.el | 2 +- lisp/subr.el | 11 +---------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3b33866657..dfea2f43e54 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-07-12 Lars Magne Ingebrigtsen + + * subr.el (remove-duplicates): Remove; `delete-dups' is sufficient. + + * dired-x.el (dired-guess-default): Use `delete-dups'. + 2011-07-12 Chong Yidong * dired.el (dired-mark-prompt): diff --git a/lisp/dired-x.el b/lisp/dired-x.el index a341e4f07a1..0f2cfd4973f 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -1103,7 +1103,7 @@ See `dired-guess-shell-alist-user'." ;; Return commands or nil if flist is still non-nil. ;; Evaluate the commands in order that any logical testing will be done. (if (cdr cmds) - (remove-duplicates (mapcar #'eval cmds)) + (delete-dups (mapcar #'eval cmds)) (eval (car cmds))))) ; single command (defun dired-guess-shell-command (prompt files) diff --git a/lisp/subr.el b/lisp/subr.el index 2b7ba17e10c..5c9d6c8d724 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -173,7 +173,7 @@ value of last one, or nil if there are none. (progn ;; If we reload subr.el after having loaded CL, be careful not to ;; overwrite CL's extended definition of `dolist', `dotimes', - ;; `declare', `push', `pop' and `remove-duplicates'. + ;; `declare', `push' and `pop'. (defmacro dolist (spec &rest body) "Loop over a list. @@ -250,15 +250,6 @@ the return value (nil if RESULT is omitted). Treated as a declaration when used at the right place in a `defmacro' form. \(See Info anchor `(elisp)Definition of declare'.)" nil) - -(defun remove-duplicates (list) - "Return a copy of LIST with all duplicate elements removed." - (let ((result nil)) - (while list - (unless (member (car list) result) - (push (car list) result)) - (pop list)) - (nreverse result))) )) (defmacro ignore-errors (&rest body)