From 7560ef7de925b56f367df168befc9b748b6237c1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Thu, 17 Jan 2019 15:11:21 +0000 Subject: [PATCH] Revert "Fix icomplete's cycling when filename filtering kicks in" This reverts commit cdb082322d4209c5104bc1a98b21bf3dd75e8f17, which was a fix for bug#34070. A much better fix to be added soon. --- lisp/icomplete.el | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 82e2728487b..8bed46cb3b3 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -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 -- 2.39.2