aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Adams2016-04-28 19:31:43 +0200
committerLars Ingebrigtsen2016-04-28 19:31:43 +0200
commit65797b1d75e9f608ffd50fd88be47a854b143bb1 (patch)
tree888fadb071f62ef0429603d19d55a0b7b723bb03
parentf078ef90cbcf479053efd81e1d95e50e64da2e99 (diff)
downloademacs-65797b1d75e9f608ffd50fd88be47a854b143bb1.tar.gz
emacs-65797b1d75e9f608ffd50fd88be47a854b143bb1.zip
Make icomplete respect `completion-ignored-extensions'
* lisp/icomplete.el (icomplete-completions): Heed `completion-ignored-extensions' (bug#12939).
-rw-r--r--etc/NEWS4
-rw-r--r--lisp/icomplete.el3
2 files changed, 7 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index c7bc34fe0e3..543b3bac7a7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -56,6 +56,10 @@ affected by this, as SGI stopped supporting IRIX in December 2013.
56 56
57* Changes in Emacs 25.2 57* Changes in Emacs 25.2
58 58
59---
60** icomplete now respects `completion-ignored-extensions'.
61
62+++
59** Non-breaking hypens are now displayed with the `nobreak-hyphen' 63** Non-breaking hypens are now displayed with the `nobreak-hyphen'
60face instead of the `escape-glyph' face. 64face instead of the `escape-glyph' face.
61 65
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 3b60daa9654..6a962640dea 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -388,6 +388,9 @@ matches exist."
388 (progn ;;(debug (format "Candidates=%S field=%S" candidates name)) 388 (progn ;;(debug (format "Candidates=%S field=%S" candidates name))
389 (format " %sNo matches%s" open-bracket close-bracket)) 389 (format " %sNo matches%s" open-bracket close-bracket))
390 (if last (setcdr last nil)) 390 (if last (setcdr last nil))
391 (when (and minibuffer-completing-file-name
392 icomplete-with-completion-tables)
393 (setq comps (completion-pcm--filename-try-filter comps)))
391 (let* ((most-try 394 (let* ((most-try
392 (if (and base-size (> base-size 0)) 395 (if (and base-size (> base-size 0))
393 (completion-try-completion 396 (completion-try-completion