[Emacs-diffs] /srv/bzr/emacs/trunk r105094: (dired-guess-default): Remove duplicate shell command entries.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105094
fixes bug(s): http://debbugs.gnu.org/2028
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2011-07-11 15:34:35 +0200
message:
  (dired-guess-default): Remove duplicate shell command entries.
modified:
  lisp/ChangeLog
  lisp/dired-x.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-11 13:33:05 +0000
+++ b/lisp/ChangeLog    2011-07-11 13:34:35 +0000
@@ -1,5 +1,8 @@
 2011-07-11  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/dired-x.el'
--- a/lisp/dired-x.el   2011-07-06 17:10:36 +0000
+++ b/lisp/dired-x.el   2011-07-11 13:34:35 +0000
@@ -1103,9 +1103,10 @@
 
     ;; 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."