[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nix-mode 12d1e29ff1 397/500: Merge pull request #106 from
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nix-mode 12d1e29ff1 397/500: Merge pull request #106 from jcs-PR/minor |
Date: |
Sat, 29 Jan 2022 08:27:48 -0500 (EST) |
branch: elpa/nix-mode
commit 12d1e29ff1d437ac3fc7f98b133ff28a32e0edb5
Merge: 471a90ac96 458c83f8bd
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #106 from jcs-PR/minor
Fixed minor issues for `nix-mode.el`.
---
nix-mode.el | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/nix-mode.el b/nix-mode.el
index 75c2cfc589..204f7ddb02 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -4,7 +4,7 @@
;; Homepage: https://github.com/NixOS/nix-mode
;; Version: 1.4.4
;; Keywords: nix, languages, tools, unix
-;; Package-Requires: ((emacs "25"))
+;; Package-Requires: ((emacs "25.1"))
;; This file is NOT part of GNU Emacs.
@@ -543,7 +543,7 @@ STRING-TYPE type of string based off of Emacs syntax table
types"
(ignore (goto-char start))))))
(defun nix-smie--skip-angle-path-backward ()
- "Skip backward a path enclosed in angle brackets, e.g <nixpkgs>"
+ "Skip backward a path enclosed in angle brackets, e.g <nixpkgs>"
(let ((start (point)))
(when (eq (char-before) ?>)
(backward-char)
@@ -660,7 +660,7 @@ STRING-TYPE type of string based off of Emacs syntax table
types"
(if (and (memq (char-after) '(?\[ ?{))
(not (save-excursion (forward-char) (nix-smie--eol-p))))
(current-column)
- (nix-smie--anchor)))
+ (nix-smie--anchor)))
(scan-error nil)))))
(defun nix-smie--indent-exps ()
@@ -984,8 +984,8 @@ The hook `nix-mode-hook' is run when Nix mode is started.
;; Setup SMIE integration
(when nix-mode-use-smie
(smie-setup nix-smie-grammar 'nix-smie-rules
- :forward-token 'nix-smie--forward-token
- :backward-token 'nix-smie--backward-token)
+ :forward-token 'nix-smie--forward-token
+ :backward-token 'nix-smie--backward-token)
(setq-local smie-indent-basic 2)
(let ((nix-smie-indent-functions
@@ -998,11 +998,12 @@ The hook `nix-mode-hook' is run when Nix mode is started.
(setq-local smie-indent-functions nix-smie-indent-functions)))
;; Automatic indentation [C-j]
- (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))))
+ (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 fbcbc446f8 254/500: Add attr to nix-search, (continued)
- [nongnu] elpa/nix-mode fbcbc446f8 254/500: Add attr to nix-search, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode b0829d67c5 256/500: Fix missing parens and standardize regexp style, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ccb320ab31 344/500: Make sure update .elc is available when running tests, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 004c81e51d 362/500: Merge branch 'master' into fix-94, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode e20afb51a4 370/500: Release 1.4.2, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode e7fa834b80 383/500: Update nix-shell.el, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 21d3ba0b80 382/500: Update yaml again, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 7487346812 378/500: Add flake, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 015bf9639a 386/500: Remove filenames handling, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 0e3a8ef7a8 398/500: Check for process before completing in nix-repl, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 12d1e29ff1 397/500: Merge pull request #106 from jcs-PR/minor,
ELPA Syncer <=
- [nongnu] elpa/nix-mode 8bc6750c4c 420/500: Update flake.lock., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1b1b9fb61d 440/500: Update nixos, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode f2acc55830 431/500: Add .dir-locals.el file, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1697f18066 439/500: Fix #128, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 04d9a86eae 437/500: Merge pull request #130 from nagy/simplify, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9362a70d0b 468/500: nix-flake: Organize the library into outlines, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 241cc0881e 466/500: nix-flake.el: Init nix-flake command, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode dd0d1c0d0b 467/500: nix-flake: WIP: nix-flake-init, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode acf4fd09db 470/500: nix-flake: Add customization options, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 7346057087 471/500: nix-flake: Show aliases in the registry as well, ELPA Syncer, 2022/01/29