[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/orderless 4e4774474c 201/204: Remove strict initialism
From: |
ELPA Syncer |
Subject: |
[elpa] externals/orderless 4e4774474c 201/204: Remove strict initialism code by @noctuid |
Date: |
Tue, 11 Jan 2022 12:58:31 -0500 (EST) |
branch: externals/orderless
commit 4e4774474cfd3594bead5ceca93aeb9401901397
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
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)))
---
README.org | 16 ----------------
orderless.el | 42 ------------------------------------------
orderless.texi | 19 -------------------
3 files changed, 77 deletions(-)
diff --git a/README.org b/README.org
index 25794864b6..c756beb033 100644
--- a/README.org
+++ b/README.org
@@ -144,22 +144,6 @@ define new matching styles. The predefined ones are:
This maps =abc= to =\<a.*\<b.*\c=.
-- orderless-strict-initialism :: like initialism but only allow
- non-letters in between the matched words.
-
- For example =fb= would match =foo-bar= but not =foo-qux-bar=.
-
-- orderless-strict-leading-initialism :: like strict-initialism but
- require the first initial to match the candidate's first word.
-
- For example =bb= would match =bar-baz= but not =foo-bar-baz=.
-
-- orderless-strict-full-initialism :: like strict-initialism but
- require the first initial to match the candidate's first word and the
- last initial to be at the final word.
-
- For example =fbb= would match =foo-bar-baz= but not =foo-bar-baz-qux=.
-
- orderless-flex :: the characters of the component should appear in
that order in the candidate, but not necessarily consecutively.
diff --git a/orderless.el b/orderless.el
index 0719935dd9..7e97e226f1 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
diff --git a/orderless.texi b/orderless.texi
index e752f06e5f..edecf97912 100644
--- a/orderless.texi
+++ b/orderless.texi
@@ -181,25 +181,6 @@ as the beginning of a word in the candidate, in order.
This maps @samp{abc} to @samp{\<a.*\<b.*\c}.
-@item orderless-strict-initialism
-like initialism but only allow
-non-letters in between the matched words.
-
-For example @samp{fb} would match @samp{foo-bar} but not @samp{foo-qux-bar}.
-
-@item orderless-strict-leading-initialism
-like strict-initialism but
-require the first initial to match the candidate's first word.
-
-For example @samp{bb} would match @samp{bar-baz} but not @samp{foo-bar-baz}.
-
-@item orderless-strict-full-initialism
-like strict-initialism but
-require the first initial to match the candidate's first word and the
-last initial to be at the final word.
-
-For example @samp{fbb} would match @samp{foo-bar-baz} but not
@samp{foo-bar-baz-qux}.
-
@item orderless-flex
the characters of the component should appear in
that order in the candidate, but not necessarily consecutively.
- [elpa] externals/orderless 9637d7fd59 177/204: Merge pull request #56 from minad/readme-fix, (continued)
- [elpa] externals/orderless 9637d7fd59 177/204: Merge pull request #56 from minad/readme-fix, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 2646dad28c 182/204: Update manual to mention Vertico, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless f7be0fb8ee 180/204: Make strict initialism independent of syntax tables (fix #60), ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 1e84120a28 184/204: Merge pull request #70 from minad/group, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 268e56d436 186/204: Fix orderless-escapable-split-on-space, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 665ade9984 187/204: Merge pull request #76 from minad/fix-split, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 1a7011ac9c 189/204: Merge pull request #77 from minad/fix-split2, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 8cea82b6d3 194/204: Merge pull request #97 from minad/optimize-try, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless c615334c79 196/204: Simplify, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 1e59cf2b9c 195/204: Fix orderless-try-completion for hash tables and alists, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 4e4774474c 201/204: Remove strict initialism code by @noctuid,
ELPA Syncer <=
- [elpa] externals/orderless 1ccf74ffdb 200/204: Fix small bug in the alist case of try-completion, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 0f674253a8 199/204: Reword sentence for clarity, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 3678f84606 204/204: Add "This file is part of GNU Emacs", ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 5af63c1217 058/204: Merge remote-tracking branch 'github/master', ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 60e70aa53b 062/204: Add autoloads, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless b0913a9c56 044/204: Placate checkdoc again, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless f2ccc538ef 061/204: Refactor to provide reusable filtering and highlightinf functions, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 3b15b2f59d 059/204: Demote Icicles heading, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 80b53ec38e 019/204: Rename lim to limit, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 48ec46518a 037/204: Fix typo in README (thanks Juanjo!), ELPA Syncer, 2022/01/11