[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/orderless ecddc3da2e 045/204: Un-nest definition of ord
From: |
ELPA Syncer |
Subject: |
[elpa] externals/orderless ecddc3da2e 045/204: Un-nest definition of orderless--highlight-matches |
Date: |
Tue, 11 Jan 2022 12:58:16 -0500 (EST) |
branch: externals/orderless
commit ecddc3da2e005d90941410b8b450982283561e38
Author: Omar Antolín <omar.antolin@gmail.com>
Commit: Omar Antolín <omar.antolin@gmail.com>
Un-nest definition of orderless--highlight-matches
The byte compiler complains it can't find it inside the let form...
The simple is solution is ... to pollute the global namespace!
---
orderless.el | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/orderless.el b/orderless.el
index 7d3d7ae5fa..7061764fad 100644
--- a/orderless.el
+++ b/orderless.el
@@ -92,23 +92,28 @@ component regexps."
(regexp :tag "Custom regexp"))
:group 'orderless)
-(let ((faces '(orderless-match-face-0
- orderless-match-face-1
- orderless-match-face-2
- orderless-match-face-3)))
- (nconc faces faces)
- (defun orderless--highlight-matches (regexps string)
+(defcustom orderless-match-faces
+ [orderless-match-face-0
+ orderless-match-face-1
+ orderless-match-face-2
+ orderless-match-face-3]
+ "Vector of faces used (cyclically) for component matches."
+ :type '(vector 'face)
+ :group 'orderless)
+
+(defun orderless--highlight-matches (regexps string)
"Highlight matches of REGEXPS in STRING.
-Warning: only call this function when you know REGEXP matches STRING!"
+Warning: only call this if you know all REGEXPs match STRING!"
(setq string (copy-sequence string))
- (cl-loop for regexp in regexps and face in faces do
+ (cl-loop with n = (length orderless-match-faces)
+ for regexp in regexps and i from 0 do
(string-match regexp string)
(font-lock-prepend-text-property
(match-beginning 0)
(match-end 0)
- 'face face
+ 'face (aref orderless-match-faces (mod i n))
string))
- string))
+ string)
(defun orderless-all-completions (string table pred _point)
"Split STRING into components and find entries TABLE matching all.
- [elpa] externals/orderless 5c2f44d901 115/204: Allow component separator to be a function, (continued)
- [elpa] externals/orderless 5c2f44d901 115/204: Allow component separator to be a function, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 43896f3e10 140/204: Accidentally omitted the overview! Bring it back, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless b059c15911 052/204: Make orderless-prefixes more like partial-completion, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless dc3f8da022 076/204: Avoid other cl-pushnes in an autoload, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless a11302737e 018/204: Keep split-string from modifying global match data, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless c9ae65ea16 023/204: Highlight component matches in one of four faces, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 044fac0859 029/204: Revert "Better match face defaults (kindly contributed by Protesilaos)", ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 2813ffb2b1 039/204: Optimization: check if first component is string literal, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 25266dfc60 033/204: Update README.org, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 39202177e1 040/204: Undo previous optimization as it is invalid in general :(, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless ecddc3da2e 045/204: Un-nest definition of orderless--highlight-matches,
ELPA Syncer <=
- [elpa] externals/orderless 582b3a9fa8 031/204: Make all `defface' syntax more efficient+readable, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless c51037b8ef 024/204: Add custom variable for component separator regexp, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 9856eeed32 047/204: Mention prefixes style in overview, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless cacd856f9a 041/204: Leverage completion-regexp-list: simplify code, increase speed!, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 3005cf8ee9 077/204: Merge pull request #12 from noctuid/feature/strict-initialism, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless f8efbdae4d 087/204: Document style dispatches in the README, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless e16fc5ddb1 099/204: Ido has progressive completion too!, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless dc1a31b5fc 098/204: Merge remote-tracking branch 'github/master', ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 306fb267f5 100/204: Mark orderless-temporarily-change-separator obsolete (#15), ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 09f4c74280 105/204: Update dispatchers documentation, add transient vars, ELPA Syncer, 2022/01/11