diff options
| author | Daniel Mendler <mail@daniel-mendler.de> | 2021-11-01 08:42:26 +0100 |
|---|---|---|
| committer | Daniel Mendler <mail@daniel-mendler.de> | 2022-01-11 17:05:47 +0100 |
| commit | 4e4774474cfd3594bead5ceca93aeb9401901397 (patch) | |
| tree | d436cad5a170f9feeb9c5cdc4fa8d80cfbcd6e45 /orderless.el | |
| parent | 1ccf74ffdbb0dd34caa63022e92f947c09c49c86 (diff) | |
Remove strict initialism code by @noctuid
The function `orderless--separated-by` has also been added by @noctuid. However
with the removal of the strict initialism code, the contributions by @noctuid
are pushed below the 15 lines limit. The function `orderless--separated-by` has
only 11 lines.
(cl-defun orderless--separated-by (sep rxs &optional (before "") (after ""))
"Return a regexp to match the rx-regexps RXS with SEP in between.
If BEFORE is specified, add it to the beginning of the rx sequence. If AFTER is
specified, add it to the end of the rx sequence."
(rx-to-string
`(seq
,before
,@(cl-loop for (sexp . more) on rxs
collect `(group ,sexp)
when more collect `,sep)
,after)))
Diffstat (limited to 'orderless.el')
| -rw-r--r-- | orderless.el | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/orderless.el b/orderless.el index 0719935..7e97e22 100644 --- a/orderless.el +++ b/orderless.el @@ -128,9 +128,6 @@ a list of them." :options '(orderless-regexp orderless-literal orderless-initialism - orderless-strict-initialism - orderless-strict-leading-initialism - orderless-strict-full-initialism orderless-prefixes orderless-flex)) @@ -208,45 +205,6 @@ candidate, in that order, at the beginning of words." (orderless--separated-by '(zero-or-more nonl) (cl-loop for char across component collect `(seq word-start ,char)))) -(defun orderless--strict-*-initialism (component &optional anchored) - "Match a COMPONENT as a strict initialism, optionally ANCHORED. -The characters in COMPONENT must occur in the candidate in that -order at the beginning of subsequent words comprised of letters. -Only non-letters can be in between the words that start with the -initials. - -If ANCHORED is `start' require that the first initial appear in -the first word of the candidate. If ANCHORED is `both' require -that the first and last initials appear in the first and last -words of the candidate, respectively." - (orderless--separated-by - '(seq (zero-or-more alpha) word-end (zero-or-more (not alpha))) - (cl-loop for char across component collect `(seq word-start ,char)) - (when anchored '(seq (group buffer-start) (zero-or-more (not alpha)))) - (when (eq anchored 'both) - '(seq (zero-or-more alpha) word-end (zero-or-more (not alpha)) eol)))) - -(defun orderless-strict-initialism (component) - "Match a COMPONENT as a strict initialism. -This means the characters in COMPONENT must occur in the -candidate in that order at the beginning of subsequent words -comprised of letters. Only non-letters can be in between the -words that start with the initials." - (orderless--strict-*-initialism component)) - -(defun orderless-strict-leading-initialism (component) - "Match a COMPONENT as a strict initialism, anchored at start. -See `orderless-strict-initialism'. Additionally require that the -first initial appear in the first word of the candidate." - (orderless--strict-*-initialism component 'start)) - -(defun orderless-strict-full-initialism (component) - "Match a COMPONENT as a strict initialism, anchored at both ends. -See `orderless-strict-initialism'. Additionally require that the -first and last initials appear in the first and last words of the -candidate, respectively." - (orderless--strict-*-initialism component 'both)) - (defun orderless-prefixes (component) "Match a component as multiple word prefixes. The COMPONENT is split at word endings, and each piece must match |
