[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nix-mode 1268096ba7 136/500: Merge pull request #27 from l
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nix-mode 1268096ba7 136/500: Merge pull request #27 from ljli/close-open-fix |
Date: |
Sat, 29 Jan 2022 08:26:53 -0500 (EST) |
branch: elpa/nix-mode
commit 1268096ba703268a3098ea10fa854b45a04dd2dd
Merge: 5e943a77e8 de02e17924
Author: Matthew Justin Bauer <mjbauer95@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #27 from ljli/close-open-fix
Fix fontification of "}${" in some contexts
---
nix-mode.el | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/nix-mode.el b/nix-mode.el
index b99b2efafd..282078abbf 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -180,16 +180,18 @@
(defun nix--antiquote-close-open ()
(let* ((start (match-beginning 0))
- (ps (nix--get-parse-state start)))
- (when (and (not (nix--get-string-type ps))
- (nix--open-brace-antiquote-p ps))
- (let ((string-type (nix--open-brace-string-type ps)))
- (put-text-property start (+ 3 start)
- 'nix-string-type string-type)
- (put-text-property start (1+ start)
- 'nix-syntax-antiquote t)
- (put-text-property (+ 2 start) (+ 3 start)
- 'nix-syntax-antiquote t)))))
+ (ps (nix--get-parse-state start))
+ (string-type (nix--get-string-type ps)))
+ (if string-type
+ (nix--antiquote-open-at (1+ start) string-type)
+ (when (nix--open-brace-antiquote-p ps)
+ (let ((string-type (nix--open-brace-string-type ps)))
+ (put-text-property start (+ 3 start)
+ 'nix-string-type string-type)
+ (put-text-property start (1+ start)
+ 'nix-syntax-antiquote t)
+ (put-text-property (+ 2 start) (+ 3 start)
+ 'nix-syntax-antiquote t))))))
(defun nix--antiquote-close ()
(let* ((start (match-beginning 0))
- [nongnu] elpa/nix-mode c81c03b35e 403/500: nix-repl: use history file, (continued)
- [nongnu] elpa/nix-mode c81c03b35e 403/500: nix-repl: use history file, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode c19e103eee 430/500: Add support nix 2.4 flakes in search, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 5fa017c6ad 393/500: Merge pull request #105 from rossabaker/completions, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 0380e03203 406/500: Merge pull request #109 from yilinwei/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode aef98227cc 419/500: Merge branch 'master' into derived-nix-drv-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ffcab906b8 407/500: Makefile: add nix-mode project directory to 'load-path' in 'run' target, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode da7e638f2f 451/500: Spell out command argument, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode c4abb64a64 494/500: nix-flake: Add a comment, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 21ed086cca 008/500: Fix flycheck complaints., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 4fe6058fb4 142/500: allow escape sequences inside sh-mode block, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1268096ba7 136/500: Merge pull request #27 from ljli/close-open-fix,
ELPA Syncer <=
- [nongnu] elpa/nix-mode 676cc65daf 153/500: Add some README doc., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 732ce2f174 169/500: Remove case-fold-search setting, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 3a6634378a 149/500: Allow nix-repl be in custom location, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ea649349b5 156/500: Fix syntax issue, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9d0668f1d8 181/500: Ignore ''' in mmm-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 3294f8a2f8 180/500: Merge pull request #37 from dieggsy/cl-lib, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode b580c8045b 192/500: Prefer derived-mode-p when checking for specific major modes, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode d14dd9ce95 196/500: Don't assign to unbound variable: let-bind it locally instead, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 664fa51cfa 199/500: Remove mmm-mode/company feature detection, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1e72a297d7 238/500: update, ELPA Syncer, 2022/01/29