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

[Le Wang <l26wang@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

On Sun, May 5, 2013 at 11:26 PM, Óscar Fuentes <ofv@wanadoo.es> wrote:
>
> However, the real issue being discussed here is if avoiding the overhead
> of delete-dups on ido-completing-read warrants breaking some extensions
> on a catastrophic way.


Upon further reflection, I realized that #10994 is only triggered by
runs of the same string.

I've attached a patch that removes runs without calling delete-dups.
Rough testing indicates it's fast.  :)


--
Le

[-- Attachment #2: ido-remove-dups3.diff --]
[-- Type: application/octet-stream, Size: 1514 bytes --]

diff --git a/lisp/ido.el b/lisp/ido.el
index bedf00e..73ab39e 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
@@ -3787,7 +3786,7 @@ This is to make them appear as if they were \"virtual buffers\"."
 	   (if (string-match re name)
 	       (setq matches (cons item matches)))))
        items))
-    matches))
+    (ido-delete-runs matches)))
 
 
 (defun ido-set-matches ()
@@ -4678,6 +4677,25 @@ For details of keybindings, see `ido-find-file'."
 			      ido-temp-list))))
     (ido-to-end summaries)))
 
+
+(defun ido-delete-runs (list)
+  "Delete consecutive runs of same item in list.
+Comparison done with `equal'.  Runs may loop back on to the first
+item, in which case, the ending items are deleted."
+  (let ((tail list)
+        before-last-run)
+    (while tail
+      (if (consp (cdr tail))
+          (if (equal (car tail) (cadr tail))
+              (setcdr tail (cddr tail))
+            (setq before-last-run tail)
+            (setq tail (cdr tail)))
+        (setq tail (cdr tail))))
+    (when (and before-last-run
+               (equal (car list) (cadr before-last-run)))
+      (setcdr before-last-run nil)))
+  list)
+
 ;;; Helper functions for other programs
 
 (put 'dired-do-rename 'ido 'ignore)