Commit 7560ef7d authored by João Távora's avatar João Távora
Browse files

Revert "Fix icomplete's cycling when filename filtering kicks in"

This reverts commit cdb08232, which
was a fix for bug#34070.  A much better fix to be added soon.
parent 80cbfb61
......@@ -162,9 +162,6 @@ the default otherwise."
(minibuffer-force-complete-and-exit)
(minibuffer-complete-and-exit)))
(defvar icomplete--filtered-completions nil
"If non-nil completions as filtered by `icomplete-completions'")
(defun icomplete-forward-completions ()
"Step forward completions by one entry.
Second entry becomes the first and can be selected with
......@@ -172,8 +169,7 @@ Second entry becomes the first and can be selected with
(interactive)
(let* ((beg (icomplete--field-beg))
(end (icomplete--field-end))
(comps (or icomplete--filtered-completions
(completion-all-sorted-completions beg end)))
(comps (completion-all-sorted-completions beg end))
(last (last comps)))
(when comps
(setcdr last (cons (car comps) (cdr last)))
......@@ -186,8 +182,7 @@ Last entry becomes the first and can be selected with
(interactive)
(let* ((beg (icomplete--field-beg))
(end (icomplete--field-end))
(comps (or icomplete--filtered-completions
(completion-all-sorted-completions beg end)))
(comps (completion-all-sorted-completions beg end))
(last-but-one (last comps 2))
(last (cdr last-but-one)))
(when (consp last) ; At least two elements in comps
......@@ -387,11 +382,9 @@ matches exist."
(progn ;;(debug (format "Candidates=%S field=%S" candidates name))
(format " %sNo matches%s" open-bracket close-bracket))
(if last (setcdr last nil))
(if (and minibuffer-completing-file-name
icomplete-with-completion-tables)
(setq comps (completion-pcm--filename-try-filter comps)
icomplete--filtered-completions comps)
(setq icomplete--filtered-completions nil))
(when (and minibuffer-completing-file-name
icomplete-with-completion-tables)
(setq comps (completion-pcm--filename-try-filter comps)))
(let* ((most-try
(if (and base-size (> base-size 0))
(completion-try-completion
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment