[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/orderless 268e56d436 186/204: Fix orderless-escapable-s
From: |
ELPA Syncer |
Subject: |
[elpa] externals/orderless 268e56d436 186/204: Fix orderless-escapable-split-on-space |
Date: |
Tue, 11 Jan 2022 12:58:30 -0500 (EST) |
branch: externals/orderless
commit 268e56d436ef66c8d9630482cb4dae1e7ff44ee4
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Fix orderless-escapable-split-on-space
* Currently escaped backslash also escapes space
* Allocate match-data only once
---
orderless.el | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/orderless.el b/orderless.el
index b3b7688419..d332c7af43 100644
--- a/orderless.el
+++ b/orderless.el
@@ -276,7 +276,7 @@ at a word boundary in the candidate. This is similar to the
for regexp in regexps and i from 0
when (string-match regexp string) do
(cl-loop
- for (x y) on (or (cddr (match-data)) (match-data)) by #'cddr
+ for (x y) on (let ((m (match-data))) (or (cddr m) m)) by #'cddr
when x do
(add-face-text-property
x y
@@ -302,7 +302,11 @@ converted to a list of regexps according to the value of
"Split STRING on spaces, which can be escaped with backslash."
(mapcar
(lambda (piece) (replace-regexp-in-string (string 0) " " piece))
- (split-string (replace-regexp-in-string "\\\\ " (string 0) string) " ")))
+ (split-string (replace-regexp-in-string
+ "\\\\\\\\\\|\\\\ "
+ (lambda (x) (if (equal x "\\ ") (string 0) x))
+ string)
+ " +" t)))
(defun orderless-dispatch (dispatchers default string &rest args)
"Run DISPATCHERS to compute matching styles for STRING.
- [elpa] externals/orderless ee5e8bda25 149/204: Remove unnecessary :group in defcustom, (continued)
- [elpa] externals/orderless ee5e8bda25 149/204: Remove unnecessary :group in defcustom, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 237ee002ac 158/204: Make orderless-regexp match invalid regexps literally, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 9b70ac8df2 161/204: orderless-filter: Remove unnecessary condition-case, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless f6394f19f3 163/204: orderless-default-pattern-compiler: Ignore nil components, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 3440b5aa33 162/204: orderless-regexp: Return "null matcher" if regexp is invalid, ELPA Syncer, 2022/01/11
- [elpa] externals/orderless 818af9e6f0 167/204: Remove pattern compiler variable, ELPA Syncer, 2022/01/11
- [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 <=
- [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, 2022/01/11
- [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