[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nix-mode 2c19243e2a 364/500: Revert fix for #94, but leave
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nix-mode 2c19243e2a 364/500: Revert fix for #94, but leave the test. |
Date: |
Sat, 29 Jan 2022 08:27:21 -0500 (EST) |
branch: elpa/nix-mode
commit 2c19243e2ad0fb7c07b4847abba3a490eaab4585
Author: Jakub Piecuch <j.piecuch96@gmail.com>
Commit: Jakub Piecuch <j.piecuch96@gmail.com>
Revert fix for #94, but leave the test.
This reverts commit 32b013cd622a37cd553c8899332064397c90105b, reversing
changes made to ecf005009eea4ce9706e43e1ab36bf4cdf2fabb8.
---
nix-mode.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/nix-mode.el b/nix-mode.el
index 31c8efa1b1..203a412dc8 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -418,7 +418,7 @@ STRING-TYPE type of string based off of Emacs syntax table
types"
(right " -bseqskip- ")
(left " -fseqskip- "))))))
-(defconst nix-smie--symbol-chars "[:->|&=!</-+*?,;!]")
+(defconst nix-smie--symbol-chars ":->|&=!</-+*?,;!")
(defconst nix-smie--infix-symbols-re
(regexp-opt '(":" "->" "||" "&&" "==" "!=" "<" "<=" ">" ">="
@@ -573,8 +573,8 @@ STRING-TYPE type of string based off of Emacs syntax table
types"
(point)
(progn
(or (/= 0 (skip-syntax-forward "'w_"))
- (when (looking-at nix-smie--symbol-chars) (forward-char) t)
- (skip-syntax-forward "'"))
+ (/= 0 (skip-chars-forward nix-smie--symbol-chars))
+ (skip-syntax-forward ".'"))
(point)))))
(defun nix-smie--forward-token ()
@@ -595,8 +595,8 @@ STRING-TYPE type of string based off of Emacs syntax table
types"
(point)
(progn
(or (/= 0 (skip-syntax-backward "'w_"))
- (when (looking-back nix-smie--symbol-chars) (backward-char) t)
- (skip-syntax-backward "'"))
+ (/= 0 (skip-chars-backward nix-smie--symbol-chars))
+ (skip-syntax-backward ".'"))
(point)))))
(defun nix-smie--backward-token ()
- [nongnu] elpa/nix-mode 070891aae4 105/500: Fix lexical bindings., (continued)
- [nongnu] elpa/nix-mode 070891aae4 105/500: Fix lexical bindings., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ae17e75812 120/500: First try at smie from damiencassou/nix-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode c758b179e9 184/500: Add nix-shebang, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1b8b6f5eac 339/500: Add failing test that checks indentation of let expressions., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 2bb0a0c1f4 340/500: Improve indentation of let expressions., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1b2f22f235 343/500: Add issue 84 test, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode aaef8580c5 351/500: Merge pull request #86 from j-piecuch/smie-tweaks, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 4ffab960ef 345/500: Add AUTHORS.md to gitignore, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ecf005009e 361/500: Remove org-man.el from .texi makefile rule, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 32b013cd62 363/500: Merge pull request #97 from NixOS/fix-94, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 2c19243e2a 364/500: Revert fix for #94, but leave the test.,
ELPA Syncer <=
- [nongnu] elpa/nix-mode 55985b326b 366/500: Be smarter about tokenizing symbols., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode a54fc29289 372/500: Always “decompose” in nix-prettify-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode c34990e956 371/500: Remove references to /gnu in nix-prettify-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9043a8d687 369/500: Merge pull request #98 from j-piecuch/94-fix, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode dc298e77b6 375/500: Merge pull request #101 from jgarte/patch-1, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode a3610b521f 385/500: Use NIX_GET_COMPLETIONS for Nix 3.0, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1dcbf13a1d 402/500: Merge pull request #111 from leungbk/make-run, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode c52795de7d 392/500: Add completion-at-point to nix-repl-mode-map, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 75f383899a 395/500: Fixed styles., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 0023fc5b10 428/500: Merge pull request #127 from leungbk/nix-drv-regexp, ELPA Syncer, 2022/01/29