diff options
| author | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2015-09-17 13:35:02 +0200 |
|---|---|---|
| committer | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2015-09-17 13:35:02 +0200 |
| commit | 0905d45e36333cd9b444ee6d6dc32ae8fd455b8a (patch) | |
| tree | 129e95b42af8adfea71184e1856573b5d6d2f4af /helm-multi-match.el | |
| parent | 849dbe84ea2b4694dd67125a73946b60751dc7a1 (diff) | |
Ensure migemo don't kick in when not available.
* helm-multi-match.el (helm-mm-3-migemo-match): Check if migemo is available.
(helm-mm-3-migemo-search): idem.
* helm-source.el (helm-source-sync): Don't plug old migemo plugin if some.
(helm-source-async): Don't plug old migemo plugin if some.
(helm-source-in-buffer): Don't plug old migemo plugin if some.
Diffstat (limited to 'helm-multi-match.el')
| -rw-r--r-- | helm-multi-match.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/helm-multi-match.el b/helm-multi-match.el index 872a46a6..05db3037 100644 --- a/helm-multi-match.el +++ b/helm-multi-match.el @@ -268,11 +268,13 @@ i.e (identity (re-search-forward \"foo\" (point-at-eol) t)) => t." (string-match (cdr helm-mm--previous-migemo-info) str)) (cl-defun helm-mm-3-migemo-match (str &optional (pattern helm-pattern)) - (cl-loop for (pred . re) in (helm-mm-3-get-patterns pattern) - always (funcall pred (helm-mm-migemo-string-match str re)))) + (and (featurep 'migemo) + (cl-loop for (pred . re) in (helm-mm-3-get-patterns pattern) + always (funcall pred (helm-mm-migemo-string-match str re))))) (defun helm-mm-3-migemo-search (pattern &rest _ignore) - (helm-mm-3-search-base pattern 'migemo-forward 'migemo-forward)) + (and (featurep 'migemo) + (helm-mm-3-search-base pattern 'migemo-forward 'migemo-forward))) ;;; mp-3p- (multiple regexp pattern 3 with prefix search) |