branch: elpa/helm
commit 60456a52f6793472599bcda98a3727d323d0224c
Author: Thierry Volpiatto <thie...@posteo.net>
Commit: Thierry Volpiatto <thie...@posteo.net>
Fix default match function insertion in matchfns
Otherwise we may miss the default function.
---
helm-source.el | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/helm-source.el b/helm-source.el
index e56b1efcd9..36f92fcd0b 100644
--- a/helm-source.el
+++ b/helm-source.el
@@ -1007,11 +1007,12 @@ or `search'."
(migemo
(append helm-mm-default-match-functions
defmatch '(helm-mm-3-migemo-match)))
- ((and defmatch (not diacritics))
- (append helm-mm-default-match-functions defmatch))
(diacritics
- (append (list 'helm-mm-exact-match
- 'helm-mm-3-match-on-diacritics)))
+ (delq nil
+ `(helm-mm-exact-match
+ ,@defmatch helm-mm-3-match-on-diacritics)))
+ (defmatch
+ (append helm-mm-default-match-functions defmatch))
(t helm-mm-default-match-functions)))
(search (cond (defsearch-strict)
((and migemo diacritics)
@@ -1022,11 +1023,12 @@ or `search'."
(migemo
(append helm-mm-default-search-functions
defsearch '(helm-mm-3-migemo-search)))
- ((and defsearch (not diacritics))
- (append helm-mm-default-search-functions defsearch))
(diacritics
- `(helm-mm-exact-search
- ,@defsearch helm-mm-3-search-on-diacritics))
+ (delq nil
+ `(helm-mm-exact-search
+ ,@defsearch helm-mm-3-search-on-diacritics)))
+ (defsearch
+ (append helm-mm-default-search-functions defsearch))
(t helm-mm-default-search-functions))))))
