[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nix-mode b12aeada41 334/500: Don’t use smie-indent-line w
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nix-mode b12aeada41 334/500: Don’t use smie-indent-line when nix-mode-use-smie is nil |
Date: |
Sat, 29 Jan 2022 08:27:18 -0500 (EST) |
branch: elpa/nix-mode
commit b12aeada4195425689fa3958a96e28a2960ccd82
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: Matthew Bauer <mjbauer95@gmail.com>
Don’t use smie-indent-line when nix-mode-use-smie is nil
---
nix-mode.el | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/nix-mode.el b/nix-mode.el
index 4fddae5862..eff49a5d6d 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -938,7 +938,11 @@ The hook `nix-mode-hook' is run when Nix mode is started.
(symbol-function 'nix-smie--indent-close)))
;; Automatic indentation [C-j]
- (setq-local indent-line-function (lambda () (funcall nix-indent-function)))
+ (setq-local indent-line-function (lambda ()
+ (if (and (not nix-mode-use-smie)
+ (eq nix-indent-function
'smie-indent-line))
+ (indent-relative)
+ (funcall nix-indent-function))))
;; Indenting of comments
(setq-local comment-start "# ")
- [nongnu] elpa/nix-mode b98c1083a0 234/500: nix-shell-file not risky, (continued)
- [nongnu] elpa/nix-mode b98c1083a0 234/500: nix-shell-file not risky, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9fb4e16c9f 233/500: Setup global-nix-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 161e7ae4d2 237/500: Cleanup nix-instantiate, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode c1b1982ea7 239/500: Fix nix-instantiate.el, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1b15a6e583 252/500: Merge pull request #46 from matthewbauer/develop, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1e53bed4d4 299/500: Move the logic for indentation of first line of file, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 79a3715c3d 303/500: Improve handling of 'in' after a hanging 'let'., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 6e4f66de1d 317/500: Add all-packages.nix test case, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode f938aeaeb6 324/500: Fix buggy implementation of nix-smie--anchor., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 63fbbf27bf 326/500: Improve indentation of closing parentheses., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode b12aeada41 334/500: Don’t use smie-indent-line when nix-mode-use-smie is nil,
ELPA Syncer <=
- [nongnu] elpa/nix-mode e5abdd41e4 352/500: add json-mode dependency, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ab49f46754 027/500: Redo keymap, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 81e8c3dea6 032/500: cleanup formatting, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 09d40e95e2 037/500: Skip braces with hanging indents, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode f29d9865e4 055/500: Fixup hanging indents., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 55ed31214a 053/500: Add "in" for closing., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ec0546a41d 051/500: Tweak hanging indent, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 0f94476b7e 117/500: nix-syntax-match-antiquote: Handle case where point has the property, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 183d4212e2 134/500: Fix fontification bug, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 42632ee471 168/500: Remove misc/ folder, ELPA Syncer, 2022/01/29