summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2011-07-13 12:19:57 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2011-07-13 12:19:57 +0000
commit0a623a10c7e89a80b6dc74445a0ae6240f65723e (patch)
tree1c7a415095c4851c69d9b4c5dd1fea46a961a37c /misc
parent2b9e29b1c8b6b8e4884a46a3ba71ee795f1f97cd (diff)
* Allow a default value in attribute selection by writing
x.y.z or default (as originally proposed in https://mail.cs.uu.nl/pipermail/nix-dev/2009-September/002989.html). For instance, an expression like stdenv.lib.attrByPath ["features" "ckSched"] false args can now be written as args.features.ckSched or false
Diffstat (limited to 'misc')
-rw-r--r--misc/emacs/nix-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/emacs/nix-mode.el b/misc/emacs/nix-mode.el
index 22e735b89..306d478bd 100644
--- a/misc/emacs/nix-mode.el
+++ b/misc/emacs/nix-mode.el
@@ -67,7 +67,7 @@ The hook `nix-mode-hook' is run when Nix mode is started.
(defvar nix-keywords
'("\\<if\\>" "\\<then\\>" "\\<else\\>" "\\<assert\\>" "\\<with\\>"
- "\\<let\\>" "\\<in\\>" "\\<rec\\>" "\\<inherit\\>"
+ "\\<let\\>" "\\<in\\>" "\\<rec\\>" "\\<inherit\\>" "\\<or\\>"
("\\<true\\>" . font-lock-builtin-face)
("\\<false\\>" . font-lock-builtin-face)
("\\<null\\>" . font-lock-builtin-face)