Merge branch 'emacs-mode-keywords' of https://github.com/pSub/nix

This commit is contained in:
Eelco Dolstra 2015-10-26 11:15:58 +01:00
commit 71039becd1

View file

@ -9,16 +9,16 @@
;;; Code: ;;; Code:
(defconst nix-font-lock-keywords (defconst nix-font-lock-keywords
'("\\<if\\>" "\\<then\\>" "\\<else\\>" "\\<assert\\>" "\\<with\\>" '("\\_<if\\_>" "\\_<then\\_>" "\\_<else\\_>" "\\_<assert\\_>" "\\_<with\\_>"
"\\<let\\>" "\\<in\\>" "\\<rec\\>" "\\<inherit\\>" "\\<or\\>" "\\_<let\\_>" "\\_<in\\_>" "\\_<rec\\_>" "\\_<inherit\\_>" "\\_<or\\_>"
("\\<true\\>" . font-lock-builtin-face) ("\\_<true\\_>" . font-lock-builtin-face)
("\\<false\\>" . font-lock-builtin-face) ("\\_<false\\_>" . font-lock-builtin-face)
("\\<null\\>" . font-lock-builtin-face) ("\\_<null\\_>" . font-lock-builtin-face)
("\\<import\\>" . font-lock-builtin-face) ("\\_<import\\_>" . font-lock-builtin-face)
("\\<derivation\\>" . font-lock-builtin-face) ("\\_<derivation\\_>" . font-lock-builtin-face)
("\\<baseNameOf\\>" . font-lock-builtin-face) ("\\_<baseNameOf\\_>" . font-lock-builtin-face)
("\\<toString\\>" . font-lock-builtin-face) ("\\_<toString\\_>" . font-lock-builtin-face)
("\\<isNull\\>" . font-lock-builtin-face) ("\\_<isNull\\_>" . font-lock-builtin-face)
("[a-zA-Z][a-zA-Z0-9\\+-\\.]*:[a-zA-Z0-9%/\\?:@&=\\+\\$,_\\.!~\\*'-]+" ("[a-zA-Z][a-zA-Z0-9\\+-\\.]*:[a-zA-Z0-9%/\\?:@&=\\+\\$,_\\.!~\\*'-]+"
. font-lock-constant-face) . font-lock-constant-face)
("\\<\\([a-zA-Z_][a-zA-Z0-9_'\-\.]*\\)[ \t]*=" ("\\<\\([a-zA-Z_][a-zA-Z0-9_'\-\.]*\\)[ \t]*="