Re: fix for bug 10994 breaks ido customizations in major way

[Óscar Fuentes]

Le Wang <address@hidden> writes:

> The only way to introduce list with dupes is ido-completing-read (i.e. it's
> not an issue for files and buffers), so I think it's okay to remove dupes
> just once on entry.
>
> Patch atached.

diff --git a/lisp/ido.el b/lisp/ido.el
index bedf00e..15e280e 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3159,8 +3159,7 @@ Use `eq' for comparison."
        (sofar nil))
     (while (not ret)
       (setq next (car items))
-      ;; Use `eq' to avoid bug http://debbugs.gnu.org/10994
-      (if (eq next elem)
+      (if (equal next elem)
          (setq ret (append items (nreverse sofar)))
        ;; else
        (progn
@@ -4795,7 +4794,7 @@ DEF, if non-nil, is the default value."
        (ido-directory-nonreadable nil)
        (ido-directory-too-big nil)
        (ido-context-switch-command 'ignore)
-       (ido-choice-list choices))
+        (ido-choice-list (delete-dups choices)))
     ;; Initialize ido before invoking ido-read-internal
     (ido-common-initialization)
     (ido-read-internal 'list prompt hist def require-match initial-input)))

Tried it and seems to work fine for both flx and the original ido bug
report about C-s/C-r with duplicates.

Leo, what do you think?