# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1365734158 -3600
# Node ID 63c73a196ade1b128464dad2a0595c6ecc884c21
# Parent  e5ca3773b0dda155485988a585d2f0152c52b84b# Parent  fb1a2de86f11bad193d38f924df5a046d863645c
Merge.

diff -r fb1a2de86f11 -r 63c73a196ade fish/config.fish
--- a/fish/config.fish	Mon Apr 08 11:15:28 2013 -0400
+++ b/fish/config.fish	Fri Apr 12 03:35:58 2013 +0100
@@ -118,7 +118,7 @@
 # }}}
 # 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.
diff -r fb1a2de86f11 -r 63c73a196ade vim/bundle/alienscript/ftdetect/alienscript.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/alienscript/ftdetect/alienscript.vim	Fri Apr 12 03:35:58 2013 +0100
@@ -0,0 +1,1 @@
+autocmd BufNewFile,BufRead *.alien set filetype=alienscript
diff -r fb1a2de86f11 -r 63c73a196ade vim/bundle/alienscript/ftplugin/alienscript.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/alienscript/ftplugin/alienscript.vim	Fri Apr 12 03:35:58 2013 +0100
@@ -0,0 +1,8 @@
+if exists("b:did_alienscript_ftplugin")
+    finish
+endif
+
+
+setlocal iskeyword+=-,>,?,=,!,<,>,+,*,/,%,&,|
+
+let b:did_alienscript_ftplugin = 1
diff -r fb1a2de86f11 -r 63c73a196ade vim/bundle/alienscript/indent/alienscript.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/alienscript/indent/alienscript.vim	Fri Apr 12 03:35:58 2013 +0100
@@ -0,0 +1,33 @@
+" For now we'll just use normal Lisp indenting because it's 1 AM and I want to
+" go to bed.
+"
+" TODO: Steal VimClojure's magic indenting.
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+setlocal expandtab nosmartindent
+
+setlocal softtabstop=2
+setlocal shiftwidth=2
+
+setlocal indentkeys=!,o,O
+
+setlocal autoindent
+setlocal indentexpr=
+setlocal lisp
+
+" Special words go here.
+setlocal lispwords=def,fn,defn
+setlocal lispwords+=if
+
+" Custom:
+" setlocal lispwords+=defn
+
+let &cpo = s:save_cpo
+
diff -r fb1a2de86f11 -r 63c73a196ade vim/bundle/alienscript/syntax/alienscript.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/alienscript/syntax/alienscript.vim	Fri Apr 12 03:35:58 2013 +0100
@@ -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"
+
diff -r fb1a2de86f11 -r 63c73a196ade vim/bundle/lispyscript/ftdetect/lispyscript.vim
--- a/vim/bundle/lispyscript/ftdetect/lispyscript.vim	Mon Apr 08 11:15:28 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-autocmd BufNewFile,BufRead *.ls set filetype=lispyscript
diff -r fb1a2de86f11 -r 63c73a196ade vim/bundle/lispyscript/ftplugin/lispyscript.vim
--- a/vim/bundle/lispyscript/ftplugin/lispyscript.vim	Mon Apr 08 11:15:28 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-if exists("b:did_lispyscript_ftplugin")
-    finish
-endif
-
-
-setlocal iskeyword+=-,>,?,=,!,<,>,+,*,/,%,&,|
-
-let b:did_lispyscript_ftplugin = 1
diff -r fb1a2de86f11 -r 63c73a196ade vim/bundle/lispyscript/indent/lispyscript.vim
--- a/vim/bundle/lispyscript/indent/lispyscript.vim	Mon Apr 08 11:15:28 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-" For now we'll just use normal Lisp indenting because it's 1 AM and I want to
-" go to bed.
-"
-" TODO: Steal VimClojure's magic indenting.
-
-if exists("b:did_indent")
-    finish
-endif
-let b:did_indent = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-setlocal expandtab nosmartindent
-
-setlocal softtabstop=2
-setlocal shiftwidth=2
-
-setlocal indentkeys=!,o,O
-
-setlocal autoindent
-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
-
-" Custom:
-setlocal lispwords+=defn
-
-let &cpo = s:save_cpo
-
diff -r fb1a2de86f11 -r 63c73a196ade vim/bundle/lispyscript/syntax/lispyscript.vim
--- a/vim/bundle/lispyscript/syntax/lispyscript.vim	Mon Apr 08 11:15:28 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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"
-