From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 11 Jul 2011 13:34:35 +0000 (+0200)
Subject: (dired-guess-default): Remove duplicate shell command entries.
X-Git-Tag: emacs-pretest-24.0.90~104^2~389
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3de9febac40b2ecd7c3a4e0c13f17f807d228fe;p=emacs.git

(dired-guess-default): Remove duplicate shell command entries.

Fixes: debbugs:2028
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb2f1a7a6e9..9fc26f61181 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* dired-x.el (dired-guess-default): Remove duplicate shell command
+	entries (bug#2028).
+
 	* subr.el (remove-duplicates): New conveniency function.
 
 2011-07-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 8395a8b905f..580217d3fbd 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1103,9 +1103,10 @@ 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)
-        (mapcar #'eval cmds)
-      (eval (car cmds))))) ; single command
+    (remove-duplicates
+     (if (cdr cmds)
+	 (mapcar #'eval cmds)
+       (eval (car cmds))))))		; single command
 
 (defun dired-guess-shell-command (prompt files)
   "Ask user with PROMPT for a shell command, guessing a default from FILES."