branch: elpa/nix-mode
commit 2c19243e2ad0fb7c07b4847abba3a490eaab4585
Author: Jakub Piecuch <[email protected]>
Commit: Jakub Piecuch <[email protected]>
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 ()
