diff options
author | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2016-08-17 18:20:12 +0200 |
---|---|---|
committer | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2016-08-17 19:42:31 +0200 |
commit | 4be5c848ff8b78925abed2f4d33680acb1958503 (patch) | |
tree | 15f9104031610d511d3fb419474421f77f3acee9 /helm-source.el | |
parent | fd1b0c87db299d9ae7b9b0d8dcb3144f71ed92c0 (diff) |
Remove completely matchplugin slot.
* helm-buffers.el (helm-source-buffers): Do it.
* helm-regexp.el (helm-source-regexp): Do it.
* helm-source.el (helm-source): Do it.
(helm-source-sync): Do it.
(helm-source-async): Do it.
(helm-source-in-buffer): Do it.
(helm-source-dummy): Do it.
(helm--setup-source): Do it.
* helm.el (helm-update-source-p): Remove deprecated no-matchplugin.
Diffstat (limited to 'helm-source.el')
-rw-r--r-- | helm-source.el | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/helm-source.el b/helm-source.el index efaf954f..048f7ae4 100644 --- a/helm-source.el +++ b/helm-source.el @@ -482,14 +482,20 @@ " `helm-follow-mode' will execute persistent-action after this delay. Otherwise value of `helm-follow-input-idle-delay' is used if non--nil, If none of these are found fallback to `helm-input-idle-delay'.") - - (matchplugin - :initarg :matchplugin + + (multimatch + :initarg :multimatch :initform t :custom boolean :documentation - " Use the multi-match algorithm when non-nil.") - + " Use the multi-match algorithm when non-nil. + I.e Allow specifying multiple patterns separated by spaces. + When a pattern is prefixed by \"!\" the negation of this pattern is used, + i.e match anything but this pattern. + It is the standard way of matching in helm and is enabled by default. + It can be used with fuzzy-matching enabled, but as soon helm detect a space, + each pattern will match by regexp and will not be fuzzy.") + (match-part :initarg :match-part :initform nil @@ -565,7 +571,7 @@ functions will be used. You can specify those functions as a list of functions or a single symbol function. - NOTE: This have the same effect as using :MATCHPLUGIN nil.")) + NOTE: This have the same effect as using :MULTIMATCH nil.")) "Use this class to make helm sources using a list of candidates. This list should be given as a normal list, a variable handling a list @@ -587,7 +593,7 @@ Matching is done basically with `string-match' against each candidate.") The process buffer should be nil, otherwise, if you use `helm-buffer' give to the process a sentinel.") - (matchplugin :initform nil)) + (multimatch :initform nil)) "Use this class to define a helm source calling an external process. The :candidates slot is not allowed even if described because this class @@ -649,7 +655,7 @@ inherit from `helm-source'.") Buffer search function used by `helm-candidates-in-buffer'. By default, `helm-candidates-in-buffer' uses `re-search-forward'. The function should take one arg PATTERN. - If your search function needs to handle negation like matchplugin, + If your search function needs to handle negation like multimatch, this function should returns in such case a cons cell of two integers defining the beg and end positions to match in the line previously matched by `re-search-forward' or similar, and move point to next line @@ -670,7 +676,7 @@ inherit from `helm-source'.") list of functions or a single symbol function. NOTE: This have the same effect as using a nil value for - :MATCHPLUGIN slot.")) + :MULTIMATCH slot.")) "Use this source to make helm sources storing candidates inside a buffer. Contrarily to `helm-source-sync' candidates are matched using a function @@ -684,7 +690,7 @@ See `helm-candidates-in-buffer' for more infos.") (filtered-candidate-transformer :initform (lambda (_candidates _source) (list helm-pattern))) - (matchplugin + (multimatch :initform nil) (accept-empty @@ -886,10 +892,10 @@ an eieio class." (append (helm-mklist it) (list helm-fuzzy-match-fn))) (setf (slot-value source 'match) helm-fuzzy-match-fn))) - (when (slot-value source 'matchplugin) + (when (slot-value source 'multimatch) (setf (slot-value source 'match) (helm-source-mm-get-search-or-match-fns source 'match))) - (helm-aif (and (null (slot-value source 'matchplugin)) + (helm-aif (and (null (slot-value source 'multimatch)) (slot-value source 'migemo)) (unless (eq it 'nomultimatch) ; Use own migemo fn. (setf (slot-value source 'match) @@ -916,10 +922,10 @@ an eieio class." (append (helm-mklist it) (list helm-fuzzy-search-fn))) (setf (slot-value source 'search) (list helm-fuzzy-search-fn)))) - (when (slot-value source 'matchplugin) + (when (slot-value source 'multimatch) (setf (slot-value source 'search) (helm-source-mm-get-search-or-match-fns source 'search))) - (helm-aif (and (null (slot-value source 'matchplugin)) + (helm-aif (and (null (slot-value source 'multimatch)) (slot-value source 'migemo)) (unless (eq it 'nomultimatch) (setf (slot-value source 'search) @@ -935,8 +941,8 @@ an eieio class." (defmethod helm--setup-source ((source helm-source-async)) (cl-assert (null (slot-value source 'candidates)) nil "Incorrect use of `candidates' use `candidates-process' instead") - (cl-assert (null (slot-value source 'matchplugin)) - nil "`matchplugin' not allowed in async sources.")) + (cl-assert (null (slot-value source 'multimatch)) + nil "`multimatch' not allowed in async sources.")) (defmethod helm--setup-source ((source helm-source-dummy)) (let ((mtc (slot-value source 'match))) |