[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rainbow-delimiters 7b882c9489 138/188: Merge (let … (let*
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rainbow-delimiters 7b882c9489 138/188: Merge (let … (let* …)) => (let* …). |
Date: |
Sat, 1 Jan 2022 00:58:59 -0500 (EST) |
branch: elpa/rainbow-delimiters
commit 7b882c948963abca8765da95c5737c90bf674122
Author: Fanael Linithien <fanael4@gmail.com>
Commit: Fanael Linithien <fanael4@gmail.com>
Merge (let … (let* …)) => (let* …).
---
rainbow-delimiters.el | 52 +++++++++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/rainbow-delimiters.el b/rainbow-delimiters.el
index 526cbd90ca..8e18009cff 100644
--- a/rainbow-delimiters.el
+++ b/rainbow-delimiters.el
@@ -281,34 +281,34 @@ Returns t if char at loc meets one of the following
conditions:
Used by font-lock for dynamic highlighting."
(setq rainbow-delimiters-escaped-char-predicate
(cdr (assoc major-mode
rainbow-delimiters-escaped-char-predicate-list)))
- (let ((inhibit-point-motion-hooks t))
- ;; Point can be anywhere in buffer; determine the nesting depth at point.
- (let* ((last-ppss-pos (point))
- (ppss (syntax-ppss))
- ;; Ignore negative depths created by unmatched closing delimiters.
- (depth (max 0 (nth 0 ppss))))
- (while (re-search-forward rainbow-delimiters--delim-regex end t)
- (let* ((delim-pos (match-beginning 0))
- (delim-syntax (syntax-after delim-pos)))
- (setq ppss (save-excursion
- (parse-partial-sexp last-ppss-pos delim-pos nil nil
ppss)))
- (setq last-ppss-pos delim-pos)
- (unless (rainbow-delimiters--char-ineligible-p delim-pos ppss (car
delim-syntax))
- (if (= 4 (logand #xFFFF (car delim-syntax)))
- (progn
- (setq depth (1+ depth))
- (rainbow-delimiters--apply-color delim-pos
- depth
- t))
- ;; Not an opening delimiter, so it's a closing delimiter.
- (let ((matching-opening-delim (char-after (nth 1 ppss))))
+ (let* ((inhibit-point-motion-hooks t)
+ ;; Point can be anywhere in buffer; determine the nesting depth at
point.
+ (last-ppss-pos (point))
+ (ppss (syntax-ppss))
+ ;; Ignore negative depths created by unmatched closing delimiters.
+ (depth (max 0 (nth 0 ppss))))
+ (while (re-search-forward rainbow-delimiters--delim-regex end t)
+ (let* ((delim-pos (match-beginning 0))
+ (delim-syntax (syntax-after delim-pos)))
+ (setq ppss (save-excursion
+ (parse-partial-sexp last-ppss-pos delim-pos nil nil
ppss)))
+ (setq last-ppss-pos delim-pos)
+ (unless (rainbow-delimiters--char-ineligible-p delim-pos ppss (car
delim-syntax))
+ (if (= 4 (logand #xFFFF (car delim-syntax)))
+ (progn
+ (setq depth (1+ depth))
(rainbow-delimiters--apply-color delim-pos
depth
- (eq (cdr delim-syntax)
- matching-opening-delim))
- ;; Don't let `depth' go negative, even if there's an unmatched
- ;; delimiter.
- (setq depth (max 0 (1- depth))))))))))
+ t))
+ ;; Not an opening delimiter, so it's a closing delimiter.
+ (let ((matching-opening-delim (char-after (nth 1 ppss))))
+ (rainbow-delimiters--apply-color delim-pos
+ depth
+ (eq (cdr delim-syntax)
+ matching-opening-delim))
+ ;; Don't let `depth' go negative, even if there's an unmatched
+ ;; delimiter.
+ (setq depth (max 0 (1- depth)))))))))
;; We already fontified the delimiters, tell font-lock there's nothing more
;; to do.
nil)
- [nongnu] elpa/rainbow-delimiters 3a18183db3 092/188: Remove cider-repl-mode from rainbow-delimiters-ignore-modes., (continued)
- [nongnu] elpa/rainbow-delimiters 3a18183db3 092/188: Remove cider-repl-mode from rainbow-delimiters-ignore-modes., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 5a56248229 101/188: Pass the variable symbol to rainbow-delimiters-apply-color directly., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters e05dd60c12 100/188: Don't propertize if the syntax table is unset, ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters d4d8f74158 110/188: Use #' to quote function names., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 575620510f 111/188: Reindent after cf61a3aee6., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 0a4e4958ed 113/188: Add a missing or in rainbow-delimiters--char-ineligible-p., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 1473fbddce 116/188: Add a test suite., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 89574443f0 117/188: Fix the Emacs 24.3-specific test failure., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 30c6a4c1bc 118/188: Use the major mode's syntax table directly., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 406ee45e7c 126/188: Rewrite the installation and usage instructions., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 7b882c9489 138/188: Merge (let … (let* …)) => (let* …).,
ELPA Syncer <=
- [nongnu] elpa/rainbow-delimiters f57067cda5 140/188: Make Emacs 23 tests less verbose., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 6e9e17e739 008/188: Add a 'global-rainbow-delimiters-mode' for enabling rainbow-delimiters in all buffers., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters daa1737a8f 011/188: Whitespace changes., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters f1ff54da71 051/188: Release version 1.3.5., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 2561e9853c 052/188: Attempt to fix issue #25., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 4c94853583 007/188: Add an item to the TODO list., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters b9252e33d2 057/188: Remove unneeded require., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters b656f8c9cd 064/188: Wrap rainbow-delimiters-{un, }propertize-region with with-silent-modifications and with-syntax-table., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters a1dd352c1a 059/188: Fix docstring style errors reported by checkdoc., ELPA Syncer, 2022/01/01
- [nongnu] elpa/rainbow-delimiters 3dfd3fa9b1 054/188: Use sorted-list caching to improve large-file performance, ELPA Syncer, 2022/01/01