summaryrefslogtreecommitdiff
path: root/helm-multi-match.el
diff options
context:
space:
mode:
authorThierry Volpiatto <thierry.volpiatto@gmail.com>2015-09-21 19:58:24 +0200
committerThierry Volpiatto <thierry.volpiatto@gmail.com>2015-09-21 19:58:24 +0200
commit3d20b06089f1c5f8ba2245d812de41e9f620dd2d (patch)
treef1bbbd40920898f61bdbe15ce724b7d040d11cc6 /helm-multi-match.el
parent4826fb7729dedc4f136ca8c9d28c9b9fbf57b02c (diff)
Add migemo for bookmarks, fix match-part for migemo (#1175).
* helm-multi-match.el (helm-mm-migemo-string-match): Use same order of args as string-match. (helm-mm-3-migemo-match): Reverse args in helm-mm-migemo-string-match call. * helm-types.el (helm--setup-source): Add migemo for bmks. * helm.el (helm-search-from-candidate-buffer): Fix match-part for migemo.
Diffstat (limited to 'helm-multi-match.el')
-rw-r--r--helm-multi-match.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/helm-multi-match.el b/helm-multi-match.el
index a03757d6..164b1c52 100644
--- a/helm-multi-match.el
+++ b/helm-multi-match.el
@@ -271,17 +271,17 @@ i.e the sources which have the slot :migemo with non--nil value."
(cl-assert (featurep 'migemo)
nil "No feature called migemo found, install migemo.el."))
-(cl-defun helm-mm-migemo-string-match (str &optional (pattern helm-pattern))
+(defun helm-mm-migemo-string-match (pattern str)
"Migemo version of `string-match'."
(unless (string= pattern (car-safe helm-mm--previous-migemo-info))
(setq helm-mm--previous-migemo-info
- (cons pattern (migemo-get-pattern pattern))))
+ (cons pattern bt(migemo-get-pattern pattern))))
(string-match (cdr helm-mm--previous-migemo-info) str))
(cl-defun helm-mm-3-migemo-match (str &optional (pattern helm-pattern))
(and helm-migemo-mode
(cl-loop for (pred . re) in (helm-mm-3-get-patterns pattern)
- always (funcall pred (helm-mm-migemo-string-match str re)))))
+ always (funcall pred (helm-mm-migemo-string-match re str)))))
(defun helm-mm-3-migemo-search (pattern &rest _ignore)
(and helm-migemo-mode