Permalink
Browse files

Merge.

  • Loading branch information...
2 parents 937091a + d838b06 commit bd68362a3f03274edac2983828f48ce8bb2c0a5e @sjl committed Jun 13, 2013
View
@@ -124,7 +124,7 @@ end
# }}}
# Bind Keys {{{
-function fish_user_key_bindings
+function fish_user_keybindings
bind \cn accept-autosuggestion
# Ignore iterm2 escape sequences. Vim will handle them if needed.
@@ -0,0 +1 @@
+autocmd BufNewFile,BufRead *.alien set filetype=alienscript
@@ -0,0 +1,8 @@
+if exists("b:did_alienscript_ftplugin")
+ finish
+endif
+
+
+setlocal iskeyword+=-,>,?,=,!,<,>,+,*,/,%,&,|
+
+let b:did_alienscript_ftplugin = 1
@@ -23,13 +23,11 @@ setlocal indentexpr=
setlocal lisp
" Special words go here.
-setlocal lispwords=function,macro,do,->,var
-setlocal lispwords+=if,cond,when,unless
-setlocal lispwords+=try
-setlocal lispwords+=loop,each,each2d,eachKey,reduce,map,for
+setlocal lispwords=def,fn,defn
+setlocal lispwords+=if
" Custom:
-setlocal lispwords+=defn
+" setlocal lispwords+=defn
let &cpo = s:save_cpo
@@ -0,0 +1,59 @@
+if exists("b:current_syntax")
+ finish
+endif
+
+syntax keyword alienscriptDefFunction defn
+
+syntax keyword alienscriptDefMacro defmacro
+
+syntax keyword alienscriptKeyword fn
+" syntax keyword alienscriptKeyword do -> new object str var
+" syntax keyword alienscriptKeyword array arrayInit arrayInit2d
+" syntax keyword alienscriptTesting assert testGroup testRunner
+" syntax keyword alienscriptTemplating template template-repeat template-repeat-key
+
+" syntax keyword alienscriptOperator undefined? null? true? false? zero? boolean?
+" syntax keyword alienscriptOperator number? string? object? array? function?
+" syntax keyword alienscriptOperator = ! != > < <= >= + - * / % &&
+" syntax match alienscriptOperator "\v([ \t()]|^)\zs\|\|\ze([ \t()]|$)"
+
+syntax keyword alienscriptConstant null undefined
+
+syntax keyword alienscriptBoolean true false
+
+" syntax keyword alienscriptRepeat loop each each2d eachKey reduce map for
+
+syntax keyword alienscriptConditional if
+
+" syntax keyword alienscriptException try catch throw
+
+" syntax keyword alienscriptImport include
+
+syntax match alienscriptComment "\v;.*$"
+
+syntax match alienscriptNumber "\v<-?\d+(\.\d+)?>"
+
+syntax region alienscriptString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+
+
+" Custom words go here...
+" syntax keyword alienscriptKeyword defn
+" syntax keyword alienscriptKeyword onload
+
+highlight link alienscriptKeyword Keyword
+" highlight link alienscriptTesting Keyword
+" highlight link alienscriptTemplating Keyword
+highlight link alienscriptDefFunction Keyword
+highlight link alienscriptDefMacro Keyword
+" highlight link alienscriptOperator Operator
+highlight link alienscriptConditional Conditional
+" highlight link alienscriptException Exception
+" highlight link alienscriptImport Include
+highlight link alienscriptBoolean Boolean
+" highlight link alienscriptRepeat Repeat
+highlight link alienscriptNumber Number
+highlight link alienscriptComment Comment
+highlight link alienscriptString String
+highlight link alienscriptConstant Constant
+
+let b:current_syntax = "alienscript"
+
@@ -1 +0,0 @@
-autocmd BufNewFile,BufRead *.ls set filetype=lispyscript
@@ -1,8 +0,0 @@
-if exists("b:did_lispyscript_ftplugin")
- finish
-endif
-
-
-setlocal iskeyword+=-,>,?,=,!,<,>,+,*,/,%,&,|
-
-let b:did_lispyscript_ftplugin = 1
@@ -1,58 +0,0 @@
-if exists("b:current_syntax")
- finish
-endif
-
-syntax keyword lispyscriptDefFunction function
-
-syntax keyword lispyscriptDefMacro macro
-
-syntax keyword lispyscriptKeyword do -> new object str var
-syntax keyword lispyscriptKeyword array arrayInit arrayInit2d
-syntax keyword lispyscriptTesting assert testGroup testRunner
-syntax keyword lispyscriptTemplating template template-repeat template-repeat-key
-
-syntax keyword lispyscriptOperator undefined? null? true? false? zero? boolean?
-syntax keyword lispyscriptOperator number? string? object? array? function?
-syntax keyword lispyscriptOperator = ! != > < <= >= + - * / % &&
-syntax match lispyscriptOperator "\v([ \t()]|^)\zs\|\|\ze([ \t()]|$)"
-
-syntax keyword lispyscriptConstant null undefined
-
-syntax keyword lispyscriptBoolean true false
-
-syntax keyword lispyscriptRepeat loop each each2d eachKey reduce map for
-
-syntax keyword lispyscriptConditional if cond when unless
-
-syntax keyword lispyscriptException try catch throw
-
-syntax keyword lispyscriptImport include
-
-syntax match lispyscriptComment "\v;.*$"
-
-syntax match lispyscriptNumber "\v<-?\d+(\.\d+)?>"
-
-syntax region lispyscriptString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+
-
-" Custom words go here...
-syntax keyword lispyscriptKeyword defn
-syntax keyword lispyscriptKeyword onload
-
-highlight link lispyscriptKeyword Keyword
-highlight link lispyscriptTesting Keyword
-highlight link lispyscriptTemplating Keyword
-highlight link lispyscriptDefFunction Keyword
-highlight link lispyscriptDefMacro Keyword
-highlight link lispyscriptOperator Operator
-highlight link lispyscriptConditional Conditional
-highlight link lispyscriptException Exception
-highlight link lispyscriptImport Include
-highlight link lispyscriptBoolean Boolean
-highlight link lispyscriptRepeat Repeat
-highlight link lispyscriptNumber Number
-highlight link lispyscriptComment Comment
-highlight link lispyscriptString String
-highlight link lispyscriptConstant Constant
-
-let b:current_syntax = "lispyscript"
-

0 comments on commit bd68362

Please sign in to comment.