branch: elpa/helm
commit 26ef562202c7a77429c65792259a24ea275af6fc
Author: Thierry Volpiatto <thie...@posteo.net>
Commit: Thierry Volpiatto <thie...@posteo.net>
Remove limitation on mm match fns for files
---
helm-files.el | 10 +++++-----
helm-multi-match.el | 10 ++++------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/helm-files.el b/helm-files.el
index 15c11ef32c..9fa4a40e76 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -3898,9 +3898,9 @@ This is meant to run in `tramp-cleanup-connection-hook'."
if (assq i bad) concat (cdr it)
else concat (string i)))
-(defun helm-ff-fuzzy-matching-p ()
- (and helm-ff-fuzzy-matching
- (not (memq helm-mm-matching-method '(multi1 multi3p)))))
+;; Keep it like this i.e. a function for evaluation in source definition.
+(defun helm-ff--fuzzy-matching-p ()
+ helm-ff-fuzzy-matching)
(defun helm-ff--transform-pattern-for-completion (pattern)
"Maybe return PATTERN with it's basename modified as a regexp.
@@ -3936,7 +3936,7 @@ If PATTERN is a valid directory name, return PATTERN
unchanged."
;; This allow showing all files/dirs matching BN (Bug#518).
;; FIXME: some multi-match methods may not work here.
(dir-p (concat (regexp-quote bd) " " (regexp-quote bn)))
- ((or (not (helm-ff-fuzzy-matching-p))
+ ((or (not (helm-ff--fuzzy-matching-p))
(string-match "[ !]" bn)) ; Fall back to multi-match.
(concat (regexp-quote bd) " " bn))
((or (string-match "[*][.]?.*" bn) ; Allow entering wildcard.
@@ -5570,7 +5570,7 @@ Show the first `helm-ff-history-max-length' elements of
(if comp-read
(let ((src (helm-build-sync-source "Helm Find Files History"
:candidates helm-ff-history
- :fuzzy-match (helm-ff-fuzzy-matching-p)
+ :fuzzy-match (helm-ff--fuzzy-matching-p)
:persistent-action 'ignore
:migemo t
:action (lambda (candidate)
diff --git a/helm-multi-match.el b/helm-multi-match.el
index d4a606f2f4..0b1c5a521d 100644
--- a/helm-multi-match.el
+++ b/helm-multi-match.el
@@ -43,12 +43,10 @@ Here are the possible value of this symbol and their
meaning:
Default is multi3, you should keep this for a better experience.
-Note that multi1 and multi3p are incompatible with fuzzy matching
-in file completion and by the way fuzzy matching will be disabled there
-when these options are used. Also the multi3f method is meant to be used within
-helm-find-files or at least when matching on a list of files or strings with a
-leading common part like the basedir of an absolute filename from the same
-directory but never globally."
+The multi3f method is meant to be used within helm-find-files or at
+least when matching on a list of files or strings with a leading common
+part like the basedir of an absolute filename from the same directory
+but never globally."
:type '(radio :tag "Matching methods for helm"
(const :tag "Multiple regexp 1 ordered with prefix match"
multi1)
(const :tag "Multiple regexp 2 ordered with partial match"
multi2)
