diff options
| author | João Távora <joaotavora@gmail.com> | 2019-01-17 15:11:21 +0000 |
|---|---|---|
| committer | João Távora <joaotavora@gmail.com> | 2019-01-17 15:11:36 +0000 |
| commit | 7560ef7de925b56f367df168befc9b748b6237c1 (patch) | |
| tree | 451fa901fb1de226567f17490409a13990e9e715 /lisp/icomplete.el | |
| parent | 80cbfb61c5a562d51197d6f3068fa5f4cda432b0 (diff) | |
| download | emacs-7560ef7de925b56f367df168befc9b748b6237c1.tar.gz | |
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.
Diffstat (limited to 'lisp/icomplete.el')
| -rw-r--r-- | lisp/icomplete.el | 17 |
1 files 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 |