[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nix-mode 28e83dd56b 360/500: Don’t overwrite smie-indent-
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nix-mode 28e83dd56b 360/500: Don’t overwrite smie-indent-exps & smie-indent-close |
Date: |
Sat, 29 Jan 2022 08:27:21 -0500 (EST) |
branch: elpa/nix-mode
commit 28e83dd56bf2355918739eb41f2eabd860ec7566
Author: Jacob Vallejo <jake@jahkeup.com>
Commit: Matthew Bauer <mjbauer95@gmail.com>
Don’t overwrite smie-indent-exps & smie-indent-close
These functions are not buffer local, so can’t be touched. Instead, we
can just replace smie-indent-function in nix-mode buffers.
---
nix-mode.el | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/nix-mode.el b/nix-mode.el
index 1c5168f0c1..203a412dc8 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -970,10 +970,15 @@ The hook `nix-mode-hook' is run when Nix mode is started.
:forward-token 'nix-smie--forward-token
:backward-token 'nix-smie--backward-token)
(setq-local smie-indent-basic 2)
- (fset (make-local-variable 'smie-indent-exps)
- (symbol-function 'nix-smie--indent-exps))
- (fset (make-local-variable 'smie-indent-close)
- (symbol-function 'nix-smie--indent-close)))
+
+ (let ((nix-smie-indent-functions
+ ;; Replace the smie-indent-* equivalents with nix-mode's.
+ (mapcar (lambda (fun) (pcase fun
+ ('smie-indent-exps 'nix-smie--indent-exps)
+ ('smie-indent-close 'nix-smie--indent-close)
+ (_ fun)))
+ smie-indent-functions)))
+ (setq-local smie-indent-functions nix-smie-indent-functions)))
;; Automatic indentation [C-j]
(setq-local indent-line-function (lambda ()
- [nongnu] elpa/nix-mode 616c368898 007/500: Add two spaces after period., (continued)
- [nongnu] elpa/nix-mode 616c368898 007/500: Add two spaces after period., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 7292d8971c 021/500: Refactor indenting, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 7f69c71f8d 019/500: Fixup mode map., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 32929d9aed 024/500: Indent relative for string, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9ab56cd6c9 035/500: Refactor indenting, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 65d0b6471f 039/500: Add more font lock constants., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 5e61391ca1 047/500: Merge branch 'lets', ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ddf091708b 353/500: Merge pull request #87 from conao3/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode abf54fb448 354/500: Emacs 25 is now the minimum version required, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode de6ef0d0c7 355/500: Give "-" the "symbol" character class, since it is a legal symbol constituent, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 28e83dd56b 360/500: Don’t overwrite smie-indent-exps & smie-indent-close,
ELPA Syncer <=
- [nongnu] elpa/nix-mode 9f24153d67 367/500: Remove redundant case in tokenizer., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode b4518ae3ee 374/500: fixed a typo, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode d13d70b37d 377/500: Merge pull request #102 from yilinwei/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode a00b3f776d 384/500: Merge pull request #103 from yilinwei/patch-1, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode bb0b49e3ac 408/500: Merge pull request #112 from leungbk/makefile-load-path, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 7d09073976 424/500: Merge pull request #121 from znewman01/fixbuild, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 4941961c75 059/500: Get rid of extra hanging indent matches., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode c577957d66 347/500: Merge pull request #85 from NixOS/fix-84, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode cccd68768b 319/500: Install info page to the right location, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode e820157994 338/500: Merge pull request #82 from jabranham/comp-warns, ELPA Syncer, 2022/01/29