--- a/.hgsub Fri Jan 20 11:57:07 2017 +0000
+++ b/.hgsub Fri Jan 20 12:12:18 2017 +0000
@@ -1,12 +1,9 @@
mercurial/hg-prompt = [hg]https://bitbucket.org/sjl/hg-prompt
mercurial/templates = [hg]https://bitbucket.org/sjl/mercurial-cli-templates
-vim/bundle/abolish = [git]git://github.com/tpope/vim-abolish.git
vim/bundle/ack = [git]git://github.com/mileszs/ack.vim.git
vim/bundle/airline = [git]git://github.com/vim-airline/vim-airline.git
vim/bundle/airline-themes = [git]git://github.com/vim-airline/vim-airline-themes.git
-vim/bundle/AnsiEsc.vim = [git]git://github.com/sjl/AnsiEsc.vim.git
vim/bundle/argumentative = [git]git://github.com/PeterRincker/vim-argumentative.git
-vim/bundle/asmx86 = [git]git://github.com/vim-scripts/asmx86.git
vim/bundle/badwolf = [hg]https://bitbucket.org/sjl/badwolf/
vim/bundle/bencode = [hg]https://bitbucket.org/sjl/vim-bencode/
vim/bundle/clam = [hg]https://bitbucket.org/sjl/clam.vim/
@@ -20,27 +17,20 @@
vim/bundle/fugitive = [git]git://github.com/tpope/vim-fugitive.git
vim/bundle/gdl = [hg]https://bitbucket.org/sjl/gdl.vim/
vim/bundle/glsl = [git]git://github.com/tikhomirov/vim-glsl.git
-vim/bundle/gnupg = [git]git://github.com/jamessan/vim-gnupg.git
vim/bundle/gnuplot = [git]git://github.com/vim-scripts/gnuplot.vim.git
vim/bundle/gundo = [hg]https://bitbucket.org/sjl/gundo.vim/
vim/bundle/html5 = [git]git://github.com/othree/html5.vim.git
vim/bundle/indent-object = [git]git://github.com/michaeljsmith/vim-indent-object.git
-vim/bundle/jack = [git]git://github.com/zirrostig/vim-jack-syntax.git
vim/bundle/javascript = [git]git://github.com/pangloss/vim-javascript.git
-vim/bundle/linediff = [git]git://github.com/AndrewRadev/linediff.vim.git
vim/bundle/markdown = [git]git://github.com/tpope/vim-markdown.git
-vim/bundle/maven = [git]git://github.com/sjl/vim-maven-plugin.git
vim/bundle/miniyank = [git]git://github.com/bfredl/nvim-miniyank.git
vim/bundle/nerdtree = [git]git://github.com/scrooloose/nerdtree.git
vim/bundle/omnisharp-vim = [git]git://github.com/sjl/omnisharp-vim.git
-vim/bundle/orgmode = [git]git://github.com/jceb/vim-orgmode.git
vim/bundle/paredit = [hg]https://bitbucket.org/kovisoft/paredit/
vim/bundle/pgsql = [git]git://github.com/exu/pgsql.vim.git
vim/bundle/python-mode = [git]git://github.com/klen/python-mode.git
vim/bundle/rainbow-parentheses = [git]git://github.com/kien/rainbow_parentheses.vim.git
vim/bundle/repeat = [git]git://github.com/tpope/vim-repeat.git
-vim/bundle/scala = [git]git://github.com/sjl/vim-scala.git
-vim/bundle/scaladoc = [git]git://github.com/sjl/vim-scaladoc.git
vim/bundle/securemodelines = [git]git://github.com/ciaranm/securemodelines.git
vim/bundle/sexp = [git]git://github.com/guns/vim-sexp.git
vim/bundle/sparkup = [git]git://github.com/tristen/vim-sparkup.git
--- a/.hgsubstate Fri Jan 20 11:57:07 2017 +0000
+++ b/.hgsubstate Fri Jan 20 12:12:18 2017 +0000
@@ -1,12 +1,9 @@
5334581e231a5167d03689ff47b3a6fdf082011c mercurial/hg-prompt
1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates
-64981213be2efd939e6e6e109e2b32c24e95fd95 vim/bundle/AnsiEsc.vim
-d64ce06650cf9b098b5a01c0db53864965d9310b vim/bundle/abolish
f183a345a0c10caed7684d07dabae33e007c7590 vim/bundle/ack
168dd7970a95c0c5049fec0b101b7f53b6a22469 vim/bundle/airline
a59cea9cae61654d7ba98ef100e3e8883c4b4022 vim/bundle/airline-themes
6c4663589e73e21e77a9ea8403dcf2bf6cf9c11c vim/bundle/argumentative
-54deda1ad27d7def8fbfebc03ae583f4b0752dd9 vim/bundle/asmx86
a6f651fa86068b8edb6799c9979a71e40caa3b42 vim/bundle/badwolf
2975b6f50397cc4912f04e3986906eca8fa441e7 vim/bundle/bencode
a4d79fc208764917cb58e2aed6fbaeb5e3356d33 vim/bundle/clam
@@ -20,27 +17,20 @@
935a2cccd3065b1322fb2235285d42728600afdf vim/bundle/fugitive
127d706f2def96876605e6bd5d366c973cb8e406 vim/bundle/gdl
6ea4e1983b18cf440c8f800a3e94b57338a3e99f vim/bundle/glsl
-6e9f52a160e3d15060848a8f453bd1b5bfa70db2 vim/bundle/gnupg
0d57b080f9fae8573c688b6679b31eb1666edc4c vim/bundle/gnuplot
9dd2d48255fcc3ac5122f6028dc238fabcccd861 vim/bundle/gundo
fccd580f5f11d576169ee347907c9fbd77af410a vim/bundle/html5
78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
-d1f19733ff5594cf5d6fb498fc599f02326860a6 vim/bundle/jack
395f8901b34cc871c9576886938a6efda0eb7268 vim/bundle/javascript
-78646801aac4d3d85e7c4e9570deccfce81a50e7 vim/bundle/linediff
dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown
-5258393bb12428c59bce8b28c9726d0326805dcf vim/bundle/maven
528e111b9fa32452366f382d50e998536d3ded85 vim/bundle/miniyank
a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree
3accc1fdb1c776729484b19623c5b841a52ed8c5 vim/bundle/omnisharp-vim
-871bc88a5bbcb6e8844a64450b8e7f8ac13aac24 vim/bundle/orgmode
5ed3bf0e4d0f1d9280ce430a089ae1ebadf4a559 vim/bundle/paredit
1a436f7d875b4ec630da081b041c73264235c7e7 vim/bundle/pgsql
fd70ac2ab74a91fb049cb8e82237c34d88354673 vim/bundle/python-mode
eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
7a6675f092842c8f81e71d5345bd7cdbf3759415 vim/bundle/repeat
-b87b9164084c093e0cbd5bff08dbbe01ea59d412 vim/bundle/scala
-1f797fda2c457202cf62d9a082a3fccd4278e3bf vim/bundle/scaladoc
10d6c6b52fcdd12f3ba457126f66fee4ccceec04 vim/bundle/securemodelines
b4398689f7483b01684044ab6b55bf369744c9b3 vim/bundle/sexp
0377b100382c19295b42018289fe8d42a7d57e80 vim/bundle/sparkup
--- a/vim/bundle/alienscript/ftdetect/alienscript.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-autocmd BufNewFile,BufRead *.alien set filetype=alienscript
--- a/vim/bundle/alienscript/ftplugin/alienscript.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-if exists("b:did_alienscript_ftplugin")
- finish
-endif
-
-
-setlocal iskeyword+=-,>,?,=,!,<,>,+,*,/,%,&,|
-
-let b:did_alienscript_ftplugin = 1
--- a/vim/bundle/alienscript/indent/alienscript.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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=def,fn,defn
-setlocal lispwords+=if
-
-" Custom:
-" setlocal lispwords+=defn
-
-let &cpo = s:save_cpo
-
--- a/vim/bundle/alienscript/syntax/alienscript.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-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"
-
--- a/vim/bundle/jinja-custom/syntax/htmljinja.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-" Vim syntax file
-" Language: Jinja HTML template
-" Maintainer: Armin Ronacher <armin.ronacher@active-4.com>
-" Last Change: 2007 Apr 8
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-endif
-
-if !exists("main_syntax")
- let main_syntax = 'html'
-endif
-
-if version < 600
- so <sfile>:p:h/jinja.vim
- so <sfile>:p:h/html.vim
-else
- runtime! syntax/jinja.vim
- runtime! syntax/html.vim
- unlet b:current_syntax
-endif
-
-let b:current_syntax = "htmljinja"
-
-source $HOME/.vim/bundle/html5/syntax/html/html5.vim
--- a/vim/bundle/jinja-custom/syntax/jinja.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-" Vim syntax file
-" Language: Jinja template
-" Maintainer: Armin Ronacher <armin.ronacher@active-4.com>
-" Last Change: 2008 May 9
-" Version: 1.1
-"
-" Known Bugs:
-" because of odd limitations dicts and the modulo operator
-" appear wrong in the template.
-"
-" Changes:
-"
-" 2008 May 9: Added support for Jinja2 changes (new keyword rules)
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-endif
-
-syntax case match
-
-" Jinja template built-in tags and parameters (without filter, macro, is and raw, they
-" have special threatment)
-syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained and if else in not or recursive as import
-
-syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained is filter skipwhite nextgroup=jinjaFilter
-syn keyword jinjaStatement containedin=jinjaTagBlock contained macro skipwhite nextgroup=jinjaFunction
-syn keyword jinjaStatement containedin=jinjaTagBlock contained block skipwhite nextgroup=jinjaBlockName
-
-" Variable Names
-syn match jinjaVariable containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/
-syn keyword jinjaSpecial containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained false true none False True None loop super caller varargs kwargs
-
-" Filters
-syn match jinjaOperator "|" containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained nextgroup=jinjaFilter
-syn match jinjaFilter contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/
-syn match jinjaFunction contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/
-syn match jinjaBlockName contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/
-
-" Jinja template constants
-syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/"/ skip=/\\"/ end=/"/
-syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/'/ skip=/\\'/ end=/'/
-syn match jinjaNumber containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[0-9]\+\(\.[0-9]\+\)\?/
-
-" Operators
-syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[+\-*\/<>=!,:]/
-syn match jinjaPunctuation containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[()\[\]]/
-syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /\./ nextgroup=jinjaAttribute
-syn match jinjaAttribute contained /[a-zA-Z_][a-zA-Z0-9_]*/
-
-" Jinja template tag and variable blocks
-syn region jinjaNested matchgroup=jinjaOperator start="(" end=")" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained
-syn region jinjaNested matchgroup=jinjaOperator start="\[" end="\]" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained
-syn region jinjaNested matchgroup=jinjaOperator start="{" end="}" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained
-syn region jinjaTagBlock matchgroup=jinjaTagDelim start=/{%-\?/ end=/-\?%}/ skipwhite containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment
-
-syn region jinjaVarBlock matchgroup=jinjaVarDelim start=/{{-\?/ end=/-\?}}/ containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment
-
-" Jinja template 'raw' tag
-syn region jinjaRaw matchgroup=jinjaRawDelim start="{%\s*raw\s*%}" end="{%\s*endraw\s*%}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString,jinjaComment
-
-" Jinja comments
-syn region jinjaComment matchgroup=jinjaCommentDelim start="{#" end="#}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString
-
-" Block start keywords. A bit tricker. We only highlight at the start of a
-" tag block and only if the name is not followed by a comma or equals sign
-" which usually means that we have to deal with an assignment.
-syn match jinjaStatement containedin=jinjaTagBlock contained skipwhite /\({%-\?\s*\)\@<=\<[a-zA-Z_][a-zA-Z0-9_]*\>\(\s*[,=]\)\@!/
-
-" and context modifiers
-syn match jinjaStatement containedin=jinjaTagBlock contained /\<with\(out\)\?\s\+context\>/ skipwhite
-
-
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_jinja_syn_inits")
- if version < 508
- let did_jinja_syn_inits = 1
- command -nargs=+ HiLink hi link <args>
- else
- command -nargs=+ HiLink hi def link <args>
- endif
-
- HiLink jinjaPunctuation jinjaOperator
- HiLink jinjaAttribute jinjaVariable
- HiLink jinjaFunction jinjaFilter
-
- HiLink jinjaTagDelim jinjaTagBlock
- HiLink jinjaVarDelim jinjaVarBlock
- HiLink jinjaCommentDelim jinjaComment
- HiLink jinjaRawDelim jinja
-
- HiLink jinjaSpecial Special
- HiLink jinjaOperator Normal
- HiLink jinjaRaw Normal
- HiLink jinjaTagBlock PreProc
- HiLink jinjaVarBlock PreProc
- HiLink jinjaStatement Statement
- HiLink jinjaFilter Function
- HiLink jinjaBlockName Function
- HiLink jinjaVariable Identifier
- HiLink jinjaString Constant
- HiLink jinjaNumber Constant
- HiLink jinjaComment Comment
-
- delcommand HiLink
-endif
-
-let b:current_syntax = "jinja"
--- a/vim/bundle/lilypond/compiler/lilypond.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-" LilyPond compiler file
-" Language: LilyPond
-" Maintainer: Heikki Junes <hjunes@cc.hut.fi>
-" Last Change: 2004 Mar 01
-"
-" Installed As: vim/compiler/lilypond.vim
-"
-" Only load this indent file when no other was loaded.
-if exists("current_compiler")
- finish
-endif
-let current_compiler = "lilypond"
-
-" default make
-setlocal makeprg=lilypond\ $*
-" errorformat for lily (with columns) and gcc
-" (how to see multiple-line error messages?)
-setlocal errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,In\ file\ included\ from\ %f:%l:,\^I\^Ifrom\ %f:%l%m
-"
--- a/vim/bundle/lilypond/ftdetect/lilypond.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-"
-" Installed As: vim/ftdetect/lilypond.vim
-"
-au! BufNewFile,BufRead *.ly,*.ily set ft=lilypond
--- a/vim/bundle/lilypond/ftplugin/lilypond.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-" LilyPond filetype plugin
-" Language: LilyPond (ft=ly)
-" Maintainer: Heikki Junes <hjunes@cc.hut.fi>
-" Last Change: 2010 Jul 26
-"
-" Installed As: vim/ftplugin/lilypond.vim
-" Uses Generated File: vim/syntax/lilypond-words.vim
-"
-" Only do this when not done yet for this buffer
-if exists("b:did_ftplugin")
- finish
-endif
-
-" Don't load another plugin for this buffer
-let b:did_ftplugin = 1
-
-setlocal autoindent
-setlocal shiftwidth=2
-"
-" some handy key mappings
-"
-" <F4> save & make and play midi with timidity
-map <buffer> <F4> :w<Return>:se makeprg=lilypond\ \"%<\"<Return>:make<Return>:!timidity "%<.midi"<Return>
-"
-" <F5> save & make
-map <buffer> <F5> :w<Return>:se makeprg=lilypond\ \"%<\"<Return>:make<Return>
-"
-" <F6> view ps with ghostview
-map <buffer> <F6> :!gv --watch "%<.ps" &<Return>
-"
-" <F7> prev error
-map <buffer> <F7> :cp<Return>
-"
-" <F8> next error
-map <buffer> <F8> :cn<Return>
-"
-" <F9> make
-map <buffer> <F9> :w<Return>:se makeprg=make\ -k<Return>:make<Return>
-"
-" <F10> menu
-source $VIMRUNTIME/menu.vim
-setlocal wildmenu
-setlocal cpo-=<
-setlocal wcm=<C-Z>
-map <buffer> <F10> :emenu <C-Z>
-"
-" <F12> comment region
-map <buffer> <F12> :g!/%.*/normal 0i%<Return>
-"
-" <S-F12> remove comments in region
-map <buffer> <S-F12> :g/%.*/normal 0x<Return>
-"
-" Completions in Insert/Replace-mode with <Ctrl-N>
-setlocal dictionary-=$VIM/syntax/lilypond-words dictionary+=$VIM/syntax/lilypond-words
-setlocal complete-=k complete+=k
-"
-setlocal showmatch
--- a/vim/bundle/lilypond/indent/lilypond.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-" LilyPond indent file
-" Language: LilyPond
-" Maintainer: Heikki Junes <hjunes@cc.hut.fi>
-" Last Change: 2010 Jul 26
-"
-" Installed As: vim/indent/lilypond.vim
-"
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
- finish
-endif
-let b:did_indent = 1
-
-setlocal indentexpr=GetLilyPondIndent()
-setlocal indentkeys=o,O,},>>,!^F
-
-" Only define the function once.
-if exists("*GetLilyPondIndent")
- finish
-endif
-
-function GetLilyPondIndent()
- if v:lnum == 1
- return 0
- endif
-
- "Find a non-blank line above the current line.
- let lnum = prevnonblank(v:lnum - 1)
- "Check if a block was started: '{' or '<<' is the last non-blank character of the previous line.
- if getline(lnum) =~ '^.*\({\|<<\)\s*$'
- let ind = indent(lnum) + &sw
- else
- let ind = indent(lnum)
- endif
-
- "Check if a block was ended: '}' or '>>' is the first non-blank character of the current line.
- if getline(v:lnum) =~ '^\s*\(}\|>>\)'
- let ind = ind - &sw
- endif
-
- " Check if the first character from the previous line is within
- " a `lilyScheme' region, and if so, use lisp-style indentation
- " for the current line.
- "
- " TODO:
- " - Only works in version 7.1.215 or later, though it should
- " silently fail in older versions.
- " - We should support `lilyScheme' regions that begin in the
- " middle of the line, too.
- for id in synstack(lnum, 1)
- if synIDattr(id, "name") == "lilyScheme"
- let ind = lispindent(v:lnum)
- endif
- endfor
-
- return ind
-endfunction
-"
-"
-"
--- a/vim/bundle/lilypond/syntax/lilypond-words Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1268 +0,0 @@
-\\xNotesOn
-\\xNotesOff
-\\xNote
-\\wordwrap-string-internal
-\\wordwrap-string
-\\wordwrap-lines
-\\wordwrap-internal
-\\wordwrap-field
-\\wordwrap
-\\withMusicProperty
-\\with-url
-\\with-link
-\\with-dimensions
-\\with-color
-\\with
-\\whiteout
-\\whiteTriangleMarkup
-\\walkerHeadsMinor
-\\walkerHeads
-\\vspace
-\\void
-\\voiceTwoStyle
-\\voiceTwo
-\\voiceThreeStyle
-\\voiceThree
-\\voiceOneStyle
-\\voiceOne
-\\voiceNeutralStyle
-\\voiceFourStyle
-\\voiceFour
-\\vocalName
-\\virgula
-\\virga
-\\verylongfermata
-\\versus
-\\version
-\\verbatim-file
-\\vcenter
-\\varcoda
-\\upright
-\\upprall
-\\upmordent
-\\upbow
-\\up
-\\unset
-\\unit
-\\unfoldRepeats
-\\underline
-\\unaCorda
-\\unHideNotes
-\\typewriter
-\\type
-\\tweak
-\\turn
-\\tupletUp
-\\tupletNeutral
-\\tupletDown
-\\trill
-\\triangle
-\\treCorde
-\\transposition
-\\transposedCueDuring
-\\transpose
-\\transparent
-\\translate-scaled
-\\translate
-\\topLevelAlignment
-\\tocTitleMarkup
-\\tocItemWithDotsMarkup
-\\tocItemMarkup
-\\tocItem
-\\tiny
-\\timing
-\\times
-\\timeSignatureSettings
-\\timeSignatureFraction
-\\time
-\\tildeSymbol
-\\tied-lyric
-\\tieWaitForNote
-\\tieUp
-\\tieSolid
-\\tieNeutral
-\\tieHalfSolid
-\\tieHalfDashed
-\\tieDown
-\\tieDotted
-\\tieDashed
-\\tieDashPattern
-\\thumb
-\\textSpannerUp
-\\textSpannerNeutral
-\\textSpannerDown
-\\textLengthOn
-\\textLengthOff
-\\text
-\\tenuto
-\\tempoWholesPerMinute
-\\tempo
-\\teeny
-\\tag
-\\table-of-contents
-\\tablatureFormat
-\\tabStaffLineLayoutFunction
-\\tabFullNotation
-\\systemStartDelimiter
-\\sustainOn
-\\sustainOff
-\\super
-\\subdivideBeams
-\\sub
-\\styledNoteHeads
-\\strut
-\\stropha
-\\strokeFingerOrientations
-\\stringTunings
-\\stringOneTopmost
-\\stringNumberOrientations
-\\stopped
-\\stopTrillSpan
-\\stopTextSpan
-\\stopStaff
-\\stopSlashedGraceMusic
-\\stopGroup
-\\stopGraceSlur
-\\stopGraceMusic
-\\stopAppoggiaturaMusic
-\\stopAcciaccaturaMusic
-\\stop
-\\stencil
-\\stemUp
-\\stemNeutral
-\\stemDown
-\\startTrillSpan
-\\startTextSpan
-\\startStaff
-\\startSlashedGraceMusic
-\\startRepeatType
-\\startGroup
-\\startGraceSlur
-\\startGraceMusic
-\\startAppoggiaturaMusic
-\\startAcciaccaturaMusic
-\\start
-\\staccato
-\\staccatissimo
-\\squashedPosition
-\\spp
-\\spacingTweaks
-\\sp
-\\southernHarmonyHeadsMinor
-\\southernHarmonyHeads
-\\sostenutoOn
-\\sostenutoOff
-\\soloText
-\\soloIIText
-\\snappizzicato
-\\smaller
-\\smallCaps
-\\small
-\\slurUp
-\\slurSolid
-\\slurNeutral
-\\slurHalfSolid
-\\slurHalfDashed
-\\slurDown
-\\slurDotted
-\\slurDashed
-\\slurDashPattern
-\\slashedGrace
-\\slashed-digit
-\\slashChordSeparator
-\\skipTypesetting
-\\skip
-\\simultaneous
-\\simple
-\\signumcongruentiae
-\\showStaffSwitch
-\\showSplitTiedTabNotes
-\\shortfermata
-\\shortVocalName
-\\shortInstrumentName
-\\shiftOnnn
-\\shiftOnn
-\\shiftOn
-\\shiftOff
-\\shiftDurations
-\\sharp
-\\shape
-\\sfz
-\\sfp
-\\sff
-\\sf
-\\settingsFrom
-\\setDefaultDurationToQuarter
-\\set
-\\sesquisharp
-\\sesquiflat
-\\sequential
-\\semisharp
-\\semiflat
-\\semicirculus
-\\semiGermanChords
-\\segno
-\\searchForVoice
-\\scriptDefinitions
-\\score
-\\scaleDurations
-\\scale
-\\sans
-\\sacredHarpHeadsMinor
-\\sacredHarpHeads
-\\rtoe
-\\rounded-box
-\\rotate
-\\roman
-\\rightHandFinger
-\\right-column
-\\right-brace
-\\right-align
-\\right
-\\rheel
-\\rfz
-\\revertTimeSignatureSettings
-\\revert
-\\reverseturn
-\\retrograde
-\\restrainOpenStrings
-\\rest
-\\responsum
-\\resetRelativeOctave
-\\replace
-\\repeatTie
-\\repeatCountVisibility
-\\repeat
-\\removeWithTag
-\\remove
-\\relative
-\\rehearsalMark
-\\raise
-\\quotedEventTypes
-\\quotedCueEventTypes
-\\quoteDuring
-\\quilisma
-\\put-adjacent
-\\pushToTag
-\\pt
-\\property-recursive
-\\printPartCombineTexts
-\\printKeyCancellation
-\\predefinedFretboardsOn
-\\predefinedFretboardsOff
-\\predefinedDiagramTable
-\\prallup
-\\prallprall
-\\prallmordent
-\\pralldown
-\\prall
-\\ppppp
-\\pppp
-\\ppp
-\\pp
-\\powerChords
-\\powerChordSymbol
-\\powerChordExceptions
-\\postscript
-\\portato
-\\pointAndClickTypes
-\\pointAndClickOn
-\\pointAndClickOff
-\\pitchedTrill
-\\pipeSymbol
-\\phrygian
-\\phrasingSlurUp
-\\phrasingSlurSolid
-\\phrasingSlurNeutral
-\\phrasingSlurHalfSolid
-\\phrasingSlurHalfDashed
-\\phrasingSlurDown
-\\phrasingSlurDotted
-\\phrasingSlurDashed
-\\phrasingSlurDashPattern
-\\pes
-\\pedalUnaCordaStyle
-\\pedalUnaCordaStrings
-\\pedalSustainStyle
-\\pedalSustainStrings
-\\pedalSostenutoStyle
-\\pedalSostenutoStrings
-\\pattern
-\\path
-\\partialJazzMusic
-\\partialJazzExceptions
-\\partial
-\\partcombineUp
-\\partcombineUnisonoOnce
-\\partcombineUnisono
-\\partcombineSoloIOnce
-\\partcombineSoloIIOnce
-\\partcombineSoloII
-\\partcombineSoloI
-\\partcombineForce
-\\partcombineDown
-\\partcombineChordsOnce
-\\partcombineChords
-\\partcombineAutomaticOnce
-\\partcombineAutomatic
-\\partcombineApartOnce
-\\partcombineApart
-\\partcombine
-\\partCombineTextsOnNote
-\\partCombineListener
-\\parenthesize
-\\parenthesisOpenSymbol
-\\parenthesisCloseSymbol
-\\parallelMusic
-\\paper
-\\palmMuteOn
-\\palmMuteOff
-\\palmMute
-\\pageTurn
-\\pageBreak
-\\page-ref
-\\page-link
-\\pad-x
-\\pad-to-box
-\\pad-markup
-\\pad-around
-\\p
-\\overrideTimeSignatureSettings
-\\overrideProperty
-\\override-lines
-\\override
-\\ottava
-\\oriscus
-\\open
-\\oneVoice
-\\once
-\\on-the-fly
-\\octaveCheck
-\\numericTimeSignature
-\\number
-\\null
-\\notemode
-\\noteToFretFunction
-\\note-by-number
-\\note
-\\normalsize
-\\normal-text
-\\normal-size-super
-\\normal-size-sub
-\\noPageTurn
-\\noPageBreak
-\\noChordSymbol
-\\noBreak
-\\noBeam
-\\newSpacingSection
-\\new
-\\neumeDemoLayout
-\\natural
-\\name
-\\musicglyph
-\\musicMap
-\\mp
-\\mordent
-\\modalTranspose
-\\modalInversion
-\\mm
-\\mixolydian
-\\minorChordModifier
-\\minor
-\\midiInstrument
-\\midiChannelMapping
-\\midi
-\\middleCPosition
-\\middleCClefPosition
-\\mf
-\\metronomeMarkFormatter
-\\mergeDifferentlyHeadedOn
-\\mergeDifferentlyHeadedOff
-\\mergeDifferentlyDottedOn
-\\mergeDifferentlyDottedOff
-\\melismaEnd
-\\melismaBusyProperties
-\\melisma
-\\medium
-\\measureLength
-\\maxima
-\\markuplist
-\\markup
-\\markletter
-\\markalphabet
-\\markFormatter
-\\mark
-\\marcato
-\\makeClusters
-\\majorSevenSymbol
-\\major
-\\maininput
-\\magnify
-\\lyricsto
-\\lyrics
-\\lyricmode
-\\lyricMelismaAlignment
-\\lydian
-\\ltoe
-\\lower
-\\lookup
-\\longfermata
-\\longa
-\\locrian
-\\localKeySignature
-\\lineprall
-\\linea
-\\line
-\\ligature
-\\lheel
-\\left-column
-\\left-brace
-\\left-align
-\\left
-\\layout
-\\larger
-\\large
-\\languageSaveAndChange
-\\languageRestore
-\\language
-\\laissezVibrer
-\\label
-\\killCues
-\\keyAlterationOrder
-\\key
-\\keepWithTag
-\\keepAliveInterfaces
-\\justify-string
-\\justify-field
-\\justify
-\\justified-lines
-\\italic
-\\italianChords
-\\ionian
-\\inversion
-\\interscoreline
-\\instrumentTransposition
-\\instrumentSwitch
-\\instrumentName
-\\instrumentEqualizer
-\\indent
-\\include
-\\inclinatum
-\\inStaffSegno
-\\in
-\\improvisationOn
-\\improvisationOff
-\\implicitTimeSignatureVisibility
-\\ij
-\\iij
-\\ignoreFiguredBassRest
-\\ignoreBarChecks
-\\ignatzekExceptions
-\\ignatzekExceptionMusic
-\\ictus
-\\huge
-\\hspace
-\\highStringOne
-\\hideStaffSwitch
-\\hideSplitTiedTabNotes
-\\hideNotes
-\\header
-\\hcenter-in
-\\hbracket
-\\harp-pedal
-\\harmonicsOn
-\\harmonicsOff
-\\harmonicNote
-\\harmonicByRatio
-\\harmonicByFret
-\\harmonicAccidentals
-\\harmonic
-\\handleNegativeFrets
-\\halign
-\\halfopen
-\\grobdescriptions
-\\graceSettings
-\\grace
-\\glissando
-\\germanChords
-\\general-align
-\\fz
-\\funkHeadsMinor
-\\funkHeads
-\\fullJazzExceptions
-\\fromproperty
-\\fret-diagram-verbose
-\\fret-diagram-terse
-\\fret-diagram
-\\frenchChords
-\\fraction
-\\fp
-\\footnote
-\\fontsize
-\\fontSize
-\\fontCaps
-\\flexa
-\\flat
-\\flageolet
-\\firstClef
-\\fingeringOrientations
-\\finger
-\\finalis
-\\filled-box
-\\fill-with-pattern
-\\fill-line
-\\figures
-\\figuremode
-\\figuredBassFormatter
-\\fffff
-\\ffff
-\\fff
-\\ff
-\\fermataMarkup
-\\fermata
-\\featherDurations
-\\f
-\\eyeglasses
-\\extraNatural
-\\explicitKeySignatureVisibility
-\\explicitCueClefVisibility
-\\explicitClefVisibility
-\\expandFullBarRests
-\\eventChords
-\\espressivo
-\\escapedSmallerSymbol
-\\escapedParenthesisOpenSymbol
-\\escapedParenthesisCloseSymbol
-\\escapedExclamationSymbol
-\\escapedBiggerSymbol
-\\epsfile
-\\episemInitium
-\\episemFinis
-\\endincipit
-\\enddim
-\\enddecresc
-\\enddecr
-\\endcresc
-\\endcr
-\\endSpanners
-\\endRepeatType
-\\easyHeadsOn
-\\easyHeadsOff
-\\dynamicUp
-\\dynamicNeutral
-\\dynamicDown
-\\dynamicAbsoluteVolumeFunction
-\\dynamic
-\\drums
-\\drummode
-\\drumStyleTable
-\\drumPitchTable
-\\draw-line
-\\draw-hline
-\\draw-circle
-\\downprall
-\\downmordent
-\\downbow
-\\down
-\\doublesharp
-\\doubleflat
-\\doubleRepeatType
-\\dotsUp
-\\dotsNeutral
-\\dotsDown
-\\dorian
-\\divisioMinima
-\\divisioMaxima
-\\divisioMaior
-\\displayMusic
-\\displayLilyMusic
-\\dir-column
-\\dimTextDim
-\\dimTextDecresc
-\\dimTextDecr
-\\dimHairpin
-\\dim
-\\description
-\\descendens
-\\deprecatedenddim
-\\deprecatedendcresc
-\\deprecateddim
-\\deprecatedcresc
-\\denies
-\\deminutum
-\\defaultchild
-\\defaultTimeSignature
-\\defaultNoteHeads
-\\defaultBarType
-\\default
-\\decrescendoSpanner
-\\decresc
-\\decr
-\\deadNotesOn
-\\deadNotesOff
-\\deadNote
-\\dashUnderscore
-\\dashPlus
-\\dashLarger
-\\dashHat
-\\dashDot
-\\dashDash
-\\dashBar
-\\cueDuringWithClef
-\\cueDuring
-\\cueClefUnset
-\\cueClef
-\\crossStaff
-\\crescendoSpanner
-\\crescTextCresc
-\\crescHairpin
-\\cresc
-\\createSpacing
-\\cr
-\\context
-\\consists
-\\concat
-\\compressFullBarRests
-\\compoundMeter
-\\command-name
-\\combine
-\\column-lines
-\\column
-\\coda
-\\cm
-\\clefPosition
-\\clefOctavation
-\\clefGlyph
-\\clef
-\\circulus
-\\circle
-\\chords
-\\chordmodifiers
-\\chordmode
-\\chordRootNamer
-\\chordPrefixSpacer
-\\chordNoteNamer
-\\chordNameSeparator
-\\chordNameLowercaseMinor
-\\chordNameFunction
-\\chordNameExceptionsPartial
-\\chordNameExceptionsFull
-\\chordNameExceptions
-\\char
-\\change
-\\center-column
-\\center-align
-\\center
-\\cavum
-\\caps
-\\caesura
-\\cadenzaOn
-\\cadenzaOff
-\\breve
-\\breathe
-\\breakDynamicSpan
-\\break
-\\bracketOpenSymbol
-\\bracketCloseSymbol
-\\bracket
-\\box
-\\bookpart
-\\bookOutputSuffix
-\\bookOutputName
-\\book
-\\bold
-\\blackTriangleMarkup
-\\bigger
-\\bendAfter
-\\beatStructure
-\\beamHalfMeasure
-\\beamExceptions
-\\beam
-\\bassStaffProperties
-\\bassFigureStaffAlignmentUp
-\\bassFigureStaffAlignmentNeutral
-\\bassFigureStaffAlignmentDown
-\\bassFigureExtendersOn
-\\bassFigureExtendersOff
-\\baseMoment
-\\barNumberVisibility
-\\barNumberFormatter
-\\barNumberCheck
-\\barCheckSynchronize
-\\barAlways
-\\bar
-\\balloonText
-\\balloonLengthOn
-\\balloonLengthOff
-\\balloonGrobText
-\\backslashed-digit
-\\automaticBars
-\\autochange
-\\autoCautionaries
-\\autoBeaming
-\\autoBeamOn
-\\autoBeamOff
-\\autoBeamCheck
-\\autoAccidentals
-\\auto-footnote
-\\augmentum
-\\auctum
-\\assertBeamSlope
-\\assertBeamQuant
-\\ascendens
-\\arrow-head
-\\arpeggioParenthesisDashed
-\\arpeggioParenthesis
-\\arpeggioNormal
-\\arpeggioBracket
-\\arpeggioArrowUp
-\\arpeggioArrowDown
-\\arpeggio
-\\appoggiatura
-\\applyOutput
-\\applyMusic
-\\applyContext
-\\appendToTag
-\\alternative
-\\alterBroken
-\\allowPageTurn
-\\alias
-\\aikenHeadsMinor
-\\aikenHeads
-\\afterGraceFraction
-\\afterGrace
-\\aeolian
-\\addlyrics
-\\additionalPitchPrefix
-\\addQuote
-\\addInstrumentDefinition
-\\accidentalStyle
-\\acciaccatura
-\\accepts
-\\accentus
-\\accent
-\\abs-fontsize
-\\aDueText
-\\RemoveEmptyTabStaffContext
-\\RemoveEmptyStaffContext
-\\RemoveEmptyRhythmicStaffContext
-\\RemoveEmptyDrumStaffContext
-\\IJ
-\\IIJ
-\\EventClasses
-\\C
-\\B
-\\AncientRemoveEmptyStaffContext
-\\A
-spacing
-signature
-routine
-notes
-handler
-corrected
-beams
-arpeggios
-Volta_engraver
-Voice
-Vertical_align_engraver
-Vaticana_ligature_engraver
-VaticanaVoice
-VaticanaStaff
-Tweak_engraver
-Tuplet_engraver
-Trill_spanner_engraver
-Timing_translator
-Time_signature_performer
-Time_signature_engraver
-Tie_performer
-Tie_engraver
-Text_spanner_engraver
-Text_engraver
-Tempo_performer
-Tab_tie_follow_engraver
-Tab_staff_symbol_engraver
-Tab_note_heads_engraver
-TabVoice
-TabStaff
-System_start_delimiter_engraver
-Stem_engraver
-Stanza_number_engraver
-Stanza_number_align_engraver
-Staff_symbol_engraver
-Staff_performer
-Staff_collecting_engraver
-StaffGroup
-Staff
-Spanner_break_forbid_engraver
-Span_bar_stub_engraver
-Span_bar_engraver
-Span_arpeggio_engraver
-Spacing_engraver
-Slur_performer
-Slur_engraver
-Slash_repeat_engraver
-Separating_line_group_engraver
-Script_row_engraver
-Script_engraver
-Script_column_engraver
-Score
-Rhythmic_column_engraver
-RhythmicStaff
-Rest_engraver
-Rest_collision_engraver
-Repeat_tie_engraver
-Repeat_acknowledge_engraver
-Pure_from_neighbor_engraver
-Pitched_trill_engraver
-Pitch_squash_engraver
-Piano_pedal_performer
-Piano_pedal_engraver
-Piano_pedal_align_engraver
-PianoStaff
-Phrasing_slur_engraver
-PetrucciVoice
-PetrucciStaff
-Percent_repeat_engraver
-Part_combine_engraver
-Parenthesis_engraver
-Paper_column_engraver
-Output_property_engraver
-Ottava_spanner_engraver
-Note_spacing_engraver
-Note_performer
-Note_name_engraver
-Note_heads_engraver
-Note_head_line_engraver
-NoteNames
-New_fingering_engraver
-New_dynamic_engraver
-Multi_measure_rest_engraver
-Metronome_mark_engraver
-Mensural_ligature_engraver
-MensuralVoice
-MensuralStaff
-Mark_engraver
-Lyrics
-Lyric_performer
-Lyric_engraver
-Ligature_bracket_engraver
-Ledger_line_engraver
-Laissez_vibrer_engraver
-KievanVoice
-KievanStaff
-Key_performer
-Key_engraver
-Keep_alive_together_engraver
-Instrument_switch_engraver
-Instrument_name_engraver
-Hyphen_engraver
-Hara_kiri_engraver
-Grob_pq_engraver
-GregorianTranscriptionVoice
-GregorianTranscriptionStaff
-GrandStaff
-Grace_spacing_engraver
-Grace_engraver
-Grace_beam_engraver
-Global
-Glissando_engraver
-Fretboard_engraver
-FretBoards
-Forbid_line_break_engraver
-Footnote_engraver
-Font_size_engraver
-Fingering_engraver
-Figured_bass_position_engraver
-Figured_bass_engraver
-FiguredBass
-Extender_engraver
-Episema_engraver
-Dynamics
-Dynamic_performer
-Dynamic_align_engraver
-Drum_notes_engraver
-Drum_note_performer
-DrumVoice
-DrumStaff
-Double_percent_repeat_engraver
-Dots_engraver
-Dot_column_engraver
-Devnull
-Default_bar_line_engraver
-Custos_engraver
-Cue_clef_engraver
-CueVoice
-Control_track_performer
-Concurrent_hairpin_engraver
-Collision_engraver
-Cluster_spanner_engraver
-Clef_engraver
-Chord_tremolo_engraver
-Chord_name_engraver
-ChordNames
-ChordNameVoice
-ChoirStaff
-Breathing_sign_engraver
-Break_align_engraver
-Bend_engraver
-Beam_performer
-Beam_engraver
-Beam_collision_engraver
-Bar_number_engraver
-Bar_engraver
-Axis_group_engraver
-Auto_beam_engraver
-Arpeggio_engraver
-Accidental_engraver
-solx
-soltcs
-soltcb
-solstqt
-solss
-solsqt
-solsd
-solsb
-sols
-solkk
-solk
-soldsd
-soldd
-sold
-solcs
-solcb
-solbtqt
-solbsb
-solbqt
-solbb
-solb
-sol
-six
-sitcs
-sitcb
-sistqt
-siss
-sisqt
-sisd
-sisb
-sis
-sikk
-sik
-sidsd
-sidd
-sid
-sics
-sicb
-sibtqt
-sibsb
-sibqt
-sibb
-sib
-si
-rex
-retcs
-retcb
-restqt
-ress
-resqt
-resd
-resb
-res
-rekk
-rek
-redsd
-redd
-red
-recs
-recb
-rebtqt
-rebsb
-rebqt
-rebb
-reb
-re
-mix
-mitcs
-mitcb
-mistqt
-miss
-misqt
-misd
-misb
-mis
-mikk
-mik
-midsd
-midd
-mid
-mics
-micb
-mibtqt
-mibsb
-mibqt
-mibb
-mib
-mi
-lax
-latcs
-latcb
-lastqt
-lass
-lasqt
-lasd
-lasb
-las
-lakk
-lak
-ladsd
-ladd
-lad
-lacs
-lacb
-labtqt
-labsb
-labqt
-labb
-lab
-la
-hississ
-hiss
-hisis
-hisih
-his
-hih
-hessess
-heses
-heseh
-h
-gx
-gtqs
-gtqf
-gss
-gsharpsharp
-gsharp
-gs
-gqs
-gqf
-gississ
-giss
-gisis
-gisih
-gis
-gih
-gflatflat
-gflat
-gff
-gf
-gessess
-gess
-geses
-geseh
-ges
-geh
-g
-fx
-ftqs
-ftqf
-fss
-fsharpsharp
-fsharp
-fs
-fqs
-fqf
-fississ
-fiss
-fisis
-fisih
-fis
-fih
-fflatflat
-fflat
-fff
-ff
-fessess
-fess
-feses
-feseh
-fes
-feh
-fax
-fatcs
-fatcb
-fastqt
-fass
-fasqt
-fasd
-fasb
-fas
-fakk
-fak
-fadsd
-fadd
-fad
-facs
-facb
-fabtqt
-fabsb
-fabqt
-fabb
-fab
-fa
-f
-ex
-etqs
-etqf
-essess
-ess
-esharpsharp
-esharp
-eses
-eseh
-es
-eqs
-eqf
-eississ
-eiss
-eisis
-eisih
-eis
-eih
-eflatflat
-eflat
-eff
-ef
-eessess
-eess
-eeses
-eeseh
-ees
-eeh
-e
-dx
-dtqs
-dtqf
-dss
-dsharpsharp
-dsharp
-ds
-dqs
-dqf
-dox
-dotcs
-dotcb
-dostqt
-doss
-dosqt
-dosd
-dosb
-dos
-dokk
-dok
-dodsd
-dodd
-dod
-docs
-docb
-dobtqt
-dobsb
-dobqt
-dobb
-dob
-do
-dississ
-diss
-disis
-disih
-dis
-dih
-dflatflat
-dflat
-dff
-df
-dessess
-dess
-deses
-deseh
-des
-deh
-d
-cx
-ctqs
-ctqf
-css
-csharpsharp
-csharp
-cs
-cqs
-cqf
-cississ
-ciss
-cisis
-cisih
-cis
-cih
-cflatflat
-cflat
-cff
-cf
-cessess
-cess
-ceses
-ceseh
-ces
-ceh
-c
-bx
-btqs
-btqf
-bss
-bsharpsharp
-bsharp
-bs
-bqs
-bqf
-bisis
-bisih
-bis
-bih
-bflatflat
-bflat
-bff
-bf
-bess
-beses
-beseh
-bes
-beh
-bb
-b
-ax
-atqs
-atqf
-assess
-ass
-asharpsharp
-asharp
-ases
-aseh
-asas
-asah
-as
-aqs
-aqf
-aississ
-aiss
-aisis
-aisih
-ais
-aih
-aflatflat
-aflat
-aff
-af
-aessess
-aess
-aeses
-aeseh
-aes
-aeh
-a
--- a/vim/bundle/lilypond/syntax/lilypond-words.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-syn match lilyKeyword "[-_^]\?\\\(xNotesOn\|xNotesOff\|xNote\|wordwrap-string-internal\|wordwrap-string\|wordwrap-lines\|wordwrap-internal\|wordwrap-field\|wordwrap\|withMusicProperty\|with-url\|with-link\|with-dimensions\|with-color\|with\|whiteout\|whiteTriangleMarkup\|walkerHeadsMinor\|walkerHeads\|vspace\|void\|voiceTwoStyle\|voiceTwo\|voiceThreeStyle\|voiceThree\|voiceOneStyle\|voiceOne\|voiceNeutralStyle\|voiceFourStyle\|voiceFour\|vocalName\|virgula\|virga\|verylongfermata\|versus\|version\|verbatim-file\|vcenter\|varcoda\|upright\|upprall\|upmordent\|upbow\|up\|unset\|unit\|unfoldRepeats\|underline\|unaCorda\|unHideNotes\|typewriter\|type\|tweak\|turn\|tupletUp\|tupletNeutral\|tupletDown\|trill\|triangle\|treCorde\|transposition\|transposedCueDuring\|transpose\|transparent\|translate-scaled\|translate\|topLevelAlignment\|tocTitleMarkup\|tocItemWithDotsMarkup\|tocItemMarkup\|tocItem\|tiny\|timing\|times\|timeSignatureSettings\|timeSignatureFraction\|time\|tildeSymbol\|tied-lyric\|tieWaitForNote\|tieUp\|tieSolid\|tieNeutral\|tieHalfSolid\|tieHalfDashed\|tieDown\|tieDotted\|tieDashed\|tieDashPattern\|thumb\|textSpannerUp\|textSpannerNeutral\|textSpannerDown\|textLengthOn\|textLengthOff\|text\|tenuto\|tempoWholesPerMinute\|tempo\|teeny\|tag\|table-of-contents\|tablatureFormat\|tabStaffLineLayoutFunction\|tabFullNotation\|systemStartDelimiter\|sustainOn\|sustainOff\|super\|subdivideBeams\|sub\|styledNoteHeads\|strut\|stropha\|strokeFingerOrientations\|stringTunings\|stringOneTopmost\|stringNumberOrientations\|stopped\|stopTrillSpan\|stopTextSpan\|stopStaff\|stopSlashedGraceMusic\|stopGroup\|stopGraceSlur\|stopGraceMusic\|stopAppoggiaturaMusic\|stopAcciaccaturaMusic\|stop\|stencil\|stemUp\|stemNeutral\|stemDown\|startTrillSpan\|startTextSpan\|startStaff\|startSlashedGraceMusic\|startRepeatType\|startGroup\|startGraceSlur\|startGraceMusic\|startAppoggiaturaMusic\|startAcciaccaturaMusic\|start\|staccato\|staccatissimo\|squashedPosition\|spp\|spacingTweaks\|sp\|southernHarmonyHeadsMinor\|southernHarmonyHeads\|sostenutoOn\|sostenutoOff\|soloText\|soloIIText\|snappizzicato\|smaller\|smallCaps\|small\|slurUp\|slurSolid\|slurNeutral\|slurHalfSolid\|slurHalfDashed\|slurDown\|slurDotted\|slurDashed\|slurDashPattern\|slashedGrace\|slashed-digit\|slashChordSeparator\|skipTypesetting\|skip\|simultaneous\|simple\|signumcongruentiae\|showStaffSwitch\|showSplitTiedTabNotes\|shortfermata\|shortVocalName\|shortInstrumentName\|shiftOnnn\|shiftOnn\|shiftOn\|shiftOff\|shiftDurations\|sharp\|shape\|sfz\|sfp\|sff\|sf\|settingsFrom\|setDefaultDurationToQuarter\|set\|sesquisharp\|sesquiflat\|sequential\|semisharp\|semiflat\|semicirculus\|semiGermanChords\|segno\|searchForVoice\|scriptDefinitions\|score\|scaleDurations\|scale\|sans\|sacredHarpHeadsMinor\|sacredHarpHeads\|rtoe\|rounded-box\|rotate\|roman\|rightHandFinger\|right-column\|right-brace\|right-align\|right\|rheel\|rfz\|revertTimeSignatureSettings\|revert\|reverseturn\|retrograde\|restrainOpenStrings\|rest\|responsum\|resetRelativeOctave\|replace\|repeatTie\|repeatCountVisibility\|repeat\|removeWithTag\|remove\|relative\|rehearsalMark\|raise\|quotedEventTypes\|quotedCueEventTypes\|quoteDuring\|quilisma\|put-adjacent\|pushToTag\|pt\|property-recursive\|printPartCombineTexts\|printKeyCancellation\|predefinedFretboardsOn\|predefinedFretboardsOff\|predefinedDiagramTable\|prallup\|prallprall\|prallmordent\|pralldown\|prall\|ppppp\|pppp\|ppp\|pp\|powerChords\|powerChordSymbol\|powerChordExceptions\|postscript\|portato\|pointAndClickTypes\|pointAndClickOn\|pointAndClickOff\|pitchedTrill\|pipeSymbol\|phrygian\|phrasingSlurUp\|phrasingSlurSolid\|phrasingSlurNeutral\|phrasingSlurHalfSolid\|phrasingSlurHalfDashed\|phrasingSlurDown\|phrasingSlurDotted\|phrasingSlurDashed\|phrasingSlurDashPattern\|pes\|pedalUnaCordaStyle\|pedalUnaCordaStrings\|pedalSustainStyle\|pedalSustainStrings\|pedalSostenutoStyle\|pedalSostenutoStrings\|pattern\|path\|partialJazzMusic\|partialJazzExceptions\|partial\|partcombineUp\|partcombineUnisonoOnce\|partcombineUnisono\|partcombineSoloIOnce\|partcombineSoloIIOnce\|partcombineSoloII\|partcombineSoloI\|partcombineForce\|partcombineDown\|partcombineChordsOnce\|partcombineChords\|partcombineAutomaticOnce\|partcombineAutomatic\|partcombineApartOnce\|partcombineApart\|partcombine\|partCombineTextsOnNote\|partCombineListener\|parenthesize\|parenthesisOpenSymbol\|parenthesisCloseSymbol\|parallelMusic\|paper\|palmMuteOn\|palmMuteOff\|palmMute\|pageTurn\|pageBreak\|page-ref\|page-link\|pad-x\|pad-to-box\|pad-markup\|pad-around\|p\|overrideTimeSignatureSettings\|overrideProperty\|override-lines\|override\|ottava\|oriscus\|open\|oneVoice\|once\|on-the-fly\|octaveCheck\|numericTimeSignature\|number\|null\|notemode\|noteToFretFunction\|note-by-number\|note\|normalsize\|normal-text\|normal-size-super\|normal-size-sub\|noPageTurn\|noPageBreak\|noChordSymbol\|noBreak\|noBeam\|newSpacingSection\|new\|neumeDemoLayout\|natural\|name\|musicglyph\|musicMap\|mp\|mordent\|modalTranspose\|modalInversion\|mm\|mixolydian\|minorChordModifier\|minor\|midiInstrument\|midiChannelMapping\|midi\|middleCPosition\|middleCClefPosition\|mf\|metronomeMarkFormatter\|mergeDifferentlyHeadedOn\|mergeDifferentlyHeadedOff\|mergeDifferentlyDottedOn\|mergeDifferentlyDottedOff\|melismaEnd\|melismaBusyProperties\|melisma\|medium\|measureLength\|maxima\|markuplist\|markup\|markletter\|markalphabet\|markFormatter\|mark\|marcato\|makeClusters\|majorSevenSymbol\|major\|maininput\|magnify\|lyricsto\|lyrics\|lyricmode\|lyricMelismaAlignment\|lydian\|ltoe\|lower\|lookup\|longfermata\|longa\|locrian\|localKeySignature\|lineprall\|linea\|line\|ligature\|lheel\|left-column\|left-brace\|left-align\|left\|layout\|larger\|large\|languageSaveAndChange\|languageRestore\|language\|laissezVibrer\|label\|killCues\|keyAlterationOrder\|key\|keepWithTag\|keepAliveInterfaces\|justify-string\|justify-field\|justify\|justified-lines\|italic\|italianChords\|ionian\|inversion\|interscoreline\|instrumentTransposition\|instrumentSwitch\|instrumentName\|instrumentEqualizer\|indent\|include\|inclinatum\|inStaffSegno\|in\|improvisationOn\|improvisationOff\|implicitTimeSignatureVisibility\|ij\|iij\|ignoreFiguredBassRest\|ignoreBarChecks\|ignatzekExceptions\|ignatzekExceptionMusic\|ictus\|huge\|hspace\|highStringOne\|hideStaffSwitch\|hideSplitTiedTabNotes\|hideNotes\|header\|hcenter-in\|hbracket\|harp-pedal\|harmonicsOn\|harmonicsOff\|harmonicNote\|harmonicByRatio\|harmonicByFret\|harmonicAccidentals\|harmonic\|handleNegativeFrets\|halign\|halfopen\|grobdescriptions\|graceSettings\|grace\|glissando\|germanChords\|general-align\|fz\|funkHeadsMinor\|funkHeads\|fullJazzExceptions\|fromproperty\|fret-diagram-verbose\|fret-diagram-terse\|fret-diagram\|frenchChords\|fraction\|fp\|footnote\|fontsize\|fontSize\|fontCaps\|flexa\|flat\|flageolet\|firstClef\|fingeringOrientations\|finger\|finalis\|filled-box\|fill-with-pattern\|fill-line\|figures\|figuremode\|figuredBassFormatter\|fffff\|ffff\|fff\|ff\|fermataMarkup\|fermata\|featherDurations\|f\|eyeglasses\|extraNatural\|explicitKeySignatureVisibility\|explicitCueClefVisibility\|explicitClefVisibility\|expandFullBarRests\|eventChords\|espressivo\|escapedSmallerSymbol\|escapedParenthesisOpenSymbol\|escapedParenthesisCloseSymbol\|escapedExclamationSymbol\|escapedBiggerSymbol\|epsfile\|episemInitium\|episemFinis\|endincipit\|enddim\|enddecresc\|enddecr\|endcresc\|endcr\|endSpanners\|endRepeatType\|easyHeadsOn\|easyHeadsOff\|dynamicUp\|dynamicNeutral\|dynamicDown\|dynamicAbsoluteVolumeFunction\|dynamic\|drums\|drummode\|drumStyleTable\|drumPitchTable\|draw-line\|draw-hline\|draw-circle\|downprall\|downmordent\|downbow\|down\|doublesharp\|doubleflat\|doubleRepeatType\|dotsUp\|dotsNeutral\|dotsDown\|dorian\|divisioMinima\|divisioMaxima\|divisioMaior\|displayMusic\|displayLilyMusic\|dir-column\|dimTextDim\|dimTextDecresc\|dimTextDecr\|dimHairpin\|dim\|description\|descendens\|deprecatedenddim\|deprecatedendcresc\|deprecateddim\|deprecatedcresc\|denies\|deminutum\|defaultchild\|defaultTimeSignature\|defaultNoteHeads\|defaultBarType\|default\|decrescendoSpanner\|decresc\|decr\|deadNotesOn\|deadNotesOff\|deadNote\|dashUnderscore\|dashPlus\|dashLarger\|dashHat\|dashDot\|dashDash\|dashBar\|cueDuringWithClef\|cueDuring\|cueClefUnset\|cueClef\|crossStaff\|crescendoSpanner\|crescTextCresc\|crescHairpin\|cresc\|createSpacing\|cr\|context\|consists\|concat\|compressFullBarRests\|compoundMeter\|command-name\|combine\|column-lines\|column\|coda\|cm\|clefPosition\|clefOctavation\|clefGlyph\|clef\|circulus\|circle\|chords\|chordmodifiers\|chordmode\|chordRootNamer\|chordPrefixSpacer\|chordNoteNamer\|chordNameSeparator\|chordNameLowercaseMinor\|chordNameFunction\|chordNameExceptionsPartial\|chordNameExceptionsFull\|chordNameExceptions\|char\|change\|center-column\|center-align\|center\|cavum\|caps\|caesura\|cadenzaOn\|cadenzaOff\|breve\|breathe\|breakDynamicSpan\|break\|bracketOpenSymbol\|bracketCloseSymbol\|bracket\|box\|bookpart\|bookOutputSuffix\|bookOutputName\|book\|bold\|blackTriangleMarkup\|bigger\|bendAfter\|beatStructure\|beamHalfMeasure\|beamExceptions\|beam\|bassStaffProperties\|bassFigureStaffAlignmentUp\|bassFigureStaffAlignmentNeutral\|bassFigureStaffAlignmentDown\|bassFigureExtendersOn\|bassFigureExtendersOff\|baseMoment\|barNumberVisibility\|barNumberFormatter\|barNumberCheck\|barCheckSynchronize\|barAlways\|bar\|balloonText\|balloonLengthOn\|balloonLengthOff\|balloonGrobText\|backslashed-digit\|automaticBars\|autochange\|autoCautionaries\|autoBeaming\|autoBeamOn\|autoBeamOff\|autoBeamCheck\|autoAccidentals\|auto-footnote\|augmentum\|auctum\|assertBeamSlope\|assertBeamQuant\|ascendens\|arrow-head\|arpeggioParenthesisDashed\|arpeggioParenthesis\|arpeggioNormal\|arpeggioBracket\|arpeggioArrowUp\|arpeggioArrowDown\|arpeggio\|appoggiatura\|applyOutput\|applyMusic\|applyContext\|appendToTag\|alternative\|alterBroken\|allowPageTurn\|alias\|aikenHeadsMinor\|aikenHeads\|afterGraceFraction\|afterGrace\|aeolian\|addlyrics\|additionalPitchPrefix\|addQuote\|addInstrumentDefinition\|accidentalStyle\|acciaccatura\|accepts\|accentus\|accent\|abs-fontsize\|aDueText\|RemoveEmptyTabStaffContext\|RemoveEmptyStaffContext\|RemoveEmptyRhythmicStaffContext\|RemoveEmptyDrumStaffContext\|IJ\|IIJ\|EventClasses\|C\|B\|AncientRemoveEmptyStaffContext\|A\|n\)\(\A\|\n\)"me=e-1
-syn match lilyReservedWord "\(\A\|\n\)\(spacing\|signature\|routine\|notes\|handler\|corrected\|beams\|arpeggios\|Volta_engraver\|Voice\|Vertical_align_engraver\|Vaticana_ligature_engraver\|VaticanaVoice\|VaticanaStaff\|Tweak_engraver\|Tuplet_engraver\|Trill_spanner_engraver\|Timing_translator\|Time_signature_performer\|Time_signature_engraver\|Tie_performer\|Tie_engraver\|Text_spanner_engraver\|Text_engraver\|Tempo_performer\|Tab_tie_follow_engraver\|Tab_staff_symbol_engraver\|Tab_note_heads_engraver\|TabVoice\|TabStaff\|System_start_delimiter_engraver\|Stem_engraver\|Stanza_number_engraver\|Stanza_number_align_engraver\|Staff_symbol_engraver\|Staff_performer\|Staff_collecting_engraver\|StaffGroup\|Staff\|Spanner_break_forbid_engraver\|Span_bar_stub_engraver\|Span_bar_engraver\|Span_arpeggio_engraver\|Spacing_engraver\|Slur_performer\|Slur_engraver\|Slash_repeat_engraver\|Separating_line_group_engraver\|Script_row_engraver\|Script_engraver\|Script_column_engraver\|Score\|Rhythmic_column_engraver\|RhythmicStaff\|Rest_engraver\|Rest_collision_engraver\|Repeat_tie_engraver\|Repeat_acknowledge_engraver\|Pure_from_neighbor_engraver\|Pitched_trill_engraver\|Pitch_squash_engraver\|Piano_pedal_performer\|Piano_pedal_engraver\|Piano_pedal_align_engraver\|PianoStaff\|Phrasing_slur_engraver\|PetrucciVoice\|PetrucciStaff\|Percent_repeat_engraver\|Part_combine_engraver\|Parenthesis_engraver\|Paper_column_engraver\|Output_property_engraver\|Ottava_spanner_engraver\|Note_spacing_engraver\|Note_performer\|Note_name_engraver\|Note_heads_engraver\|Note_head_line_engraver\|NoteNames\|New_fingering_engraver\|New_dynamic_engraver\|Multi_measure_rest_engraver\|Metronome_mark_engraver\|Mensural_ligature_engraver\|MensuralVoice\|MensuralStaff\|Mark_engraver\|Lyrics\|Lyric_performer\|Lyric_engraver\|Ligature_bracket_engraver\|Ledger_line_engraver\|Laissez_vibrer_engraver\|KievanVoice\|KievanStaff\|Key_performer\|Key_engraver\|Keep_alive_together_engraver\|Instrument_switch_engraver\|Instrument_name_engraver\|Hyphen_engraver\|Hara_kiri_engraver\|Grob_pq_engraver\|GregorianTranscriptionVoice\|GregorianTranscriptionStaff\|GrandStaff\|Grace_spacing_engraver\|Grace_engraver\|Grace_beam_engraver\|Global\|Glissando_engraver\|Fretboard_engraver\|FretBoards\|Forbid_line_break_engraver\|Footnote_engraver\|Font_size_engraver\|Fingering_engraver\|Figured_bass_position_engraver\|Figured_bass_engraver\|FiguredBass\|Extender_engraver\|Episema_engraver\|Dynamics\|Dynamic_performer\|Dynamic_align_engraver\|Drum_notes_engraver\|Drum_note_performer\|DrumVoice\|DrumStaff\|Double_percent_repeat_engraver\|Dots_engraver\|Dot_column_engraver\|Devnull\|Default_bar_line_engraver\|Custos_engraver\|Cue_clef_engraver\|CueVoice\|Control_track_performer\|Concurrent_hairpin_engraver\|Collision_engraver\|Cluster_spanner_engraver\|Clef_engraver\|Chord_tremolo_engraver\|Chord_name_engraver\|ChordNames\|ChordNameVoice\|ChoirStaff\|Breathing_sign_engraver\|Break_align_engraver\|Bend_engraver\|Beam_performer\|Beam_engraver\|Beam_collision_engraver\|Bar_number_engraver\|Bar_engraver\|Axis_group_engraver\|Auto_beam_engraver\|Arpeggio_engraver\|Accidental_engraver\|Score\)\(\A\|\n\)"ms=s+1,me=e-1
-syn match lilyNote "\<\(\(\(solx\|soltcs\|soltcb\|solstqt\|solss\|solsqt\|solsd\|solsb\|sols\|solkk\|solk\|soldsd\|soldd\|sold\|solcs\|solcb\|solbtqt\|solbsb\|solbqt\|solbb\|solb\|sol\|six\|sitcs\|sitcb\|sistqt\|siss\|sisqt\|sisd\|sisb\|sis\|sikk\|sik\|sidsd\|sidd\|sid\|sics\|sicb\|sibtqt\|sibsb\|sibqt\|sibb\|sib\|si\|rex\|retcs\|retcb\|restqt\|ress\|resqt\|resd\|resb\|res\|rekk\|rek\|redsd\|redd\|red\|recs\|recb\|rebtqt\|rebsb\|rebqt\|rebb\|reb\|re\|mix\|mitcs\|mitcb\|mistqt\|miss\|misqt\|misd\|misb\|mis\|mikk\|mik\|midsd\|midd\|mid\|mics\|micb\|mibtqt\|mibsb\|mibqt\|mibb\|mib\|mi\|lax\|latcs\|latcb\|lastqt\|lass\|lasqt\|lasd\|lasb\|las\|lakk\|lak\|ladsd\|ladd\|lad\|lacs\|lacb\|labtqt\|labsb\|labqt\|labb\|lab\|la\|hississ\|hiss\|hisis\|hisih\|his\|hih\|hessess\|heses\|heseh\|h\|gx\|gtqs\|gtqf\|gss\|gsharpsharp\|gsharp\|gs\|gqs\|gqf\|gississ\|giss\|gisis\|gisih\|gis\|gih\|gflatflat\|gflat\|gff\|gf\|gessess\|gess\|geses\|geseh\|ges\|geh\|g\|fx\|ftqs\|ftqf\|fss\|fsharpsharp\|fsharp\|fs\|fqs\|fqf\|fississ\|fiss\|fisis\|fisih\|fis\|fih\|fflatflat\|fflat\|fff\|ff\|fessess\|fess\|feses\|feseh\|fes\|feh\|fax\|fatcs\|fatcb\|fastqt\|fass\|fasqt\|fasd\|fasb\|fas\|fakk\|fak\|fadsd\|fadd\|fad\|facs\|facb\|fabtqt\|fabsb\|fabqt\|fabb\|fab\|fa\|f\|ex\|etqs\|etqf\|essess\|ess\|esharpsharp\|esharp\|eses\|eseh\|es\|eqs\|eqf\|eississ\|eiss\|eisis\|eisih\|eis\|eih\|eflatflat\|eflat\|eff\|ef\|eessess\|eess\|eeses\|eeseh\|ees\|eeh\|e\|dx\|dtqs\|dtqf\|dss\|dsharpsharp\|dsharp\|ds\|dqs\|dqf\|dox\|dotcs\|dotcb\|dostqt\|doss\|dosqt\|dosd\|dosb\|dos\|dokk\|dok\|dodsd\|dodd\|dod\|docs\|docb\|dobtqt\|dobsb\|dobqt\|dobb\|dob\|do\|dississ\|diss\|disis\|disih\|dis\|dih\|dflatflat\|dflat\|dff\|df\|dessess\|dess\|deses\|deseh\|des\|deh\|d\|cx\|ctqs\|ctqf\|css\|csharpsharp\|csharp\|cs\|cqs\|cqf\|cississ\|ciss\|cisis\|cisih\|cis\|cih\|cflatflat\|cflat\|cff\|cf\|cessess\|cess\|ceses\|ceseh\|ces\|ceh\|c\|bx\|btqs\|btqf\|bss\|bsharpsharp\|bsharp\|bs\|bqs\|bqf\|bisis\|bisih\|bis\|bih\|bflatflat\|bflat\|bff\|bf\|bess\|beses\|beseh\|bes\|beh\|bb\|b\|ax\|atqs\|atqf\|assess\|ass\|asharpsharp\|asharp\|ases\|aseh\|asas\|asah\|as\|aqs\|aqf\|aississ\|aiss\|aisis\|aisih\|ais\|aih\|aflatflat\|aflat\|aff\|af\|aessess\|aess\|aeses\|aeseh\|aes\|aeh\|a\|a\)\([,']\)\{,4}\([?!]\)\?\)\|s\|r\|R\|q\)\(\(128\|64\|32\|16\|8\|4\|2\|1\|\\breve\|\\longa\|\\maxima\)[.]\{,8}\)\?\(\A\|\n\)"me=e-1
--- a/vim/bundle/lilypond/syntax/lilypond.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-" LilyPond syntax file
-" Language: LilyPond
-" Maintainer: Heikki Junes <hjunes@cc.hut.fi>
-" Last Change: 2010 Jul 26
-"
-" Installed As: vim/syntax/lilypond.vim
-" Uses Generated File: vim/syntax/lilypond-words.vim
-"
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-endif
-
-" Read the LilyPond syntax match groups:
-" lilyKeyword, lilyReservedWord, lilyNote
-if version < 600
- so <sfile>:p:h/lilypond-words.vim
-else
- runtime! syntax/lilypond-words.vim
- if exists("b:current_syntax")
- unlet b:current_syntax
- endif
-endif
-
-" Match also parethesis of angle type
-setlocal mps+=<:>
-
-" Case matters
-syn case match
-
-syn cluster lilyMatchGroup contains=lilyMatcher,lilyString,lilyComment,lilyStatement,lilyNumber,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyArticulation,lilyReservedWord,lilyScheme
-
-syn region lilyMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[<>]" end="}" contains=@lilyMatchGroup fold
-syn region lilyMatcher matchgroup=Delimiter start="\[" end="]" contains=@lilyMatchGroup fold
-syn region lilyMatcher matchgroup=Delimiter start="<" skip="\\\\\|\\[{<>}]" end=">" contains=@lilyMatchGroup fold
-
-syn region lilyString start=/"/ end=/"/ skip=/\\"/
-syn region lilyComment start="%{" skip="%$" end="%}"
-syn region lilyComment start="%\([^{]\|$\)" end="$"
-
-syn match lilyNumber "[-_^.]\?\d\+[.]\?"
-syn match lilySlur "[(~)]"
-syn match lilySlur "\\[()]"
-syn match lilySpecial "\\[<!>\\]"
-" avoid highlighting the extra character in situations like
-" c--\mf c^^\mf c__\mf
-syn match lilyArticulation "[-_^][-_^+|>.]"
-
-" Include Scheme syntax highlighting, where appropriate
-syn include @embeddedScheme syntax/scheme.vim
-unlet b:current_syntax
-syn region lilyScheme matchgroup=Delimiter start="#['`]\?(" matchgroup=Delimiter end=")" contains=@embeddedScheme
-
-" Rest of syntax highlighting rules start here
-"
-" " Define the default highlighting.
-" " For version 5.7 and earlier: only when not done already
-" " For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lily_syn_inits")
- if version < 508
- let did_lily_syn_inits = 1
- command -nargs=+ HiLink hi link <args>
- else
- command -nargs=+ HiLink hi def link <args>
- endif
-
- HiLink Delimiter Identifier
-
- HiLink lilyString String
- HiLink lilyComment Comment
-
- HiLink lilyNote Identifier
- HiLink lilyArticulation PreProc
- HiLink lilyKeyword Keyword
- HiLink lilyReservedWord Type
-
- HiLink lilyNumber Constant
- HiLink lilySpecial Special
- HiLink lilySlur ModeMsg
-
- delcommand HiLink
-endif
-
-let b:current_syntax = "lilypond"
--- a/vim/bundle/potion/ftdetect/potion.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-autocmd BufNewFile,BufRead *.pn set filetype=potion
--- a/vim/bundle/potion/syntax/potion.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-if exists("b:current_syntax")
- finish
-endif
-
-syntax keyword potionKeyword loop times to while
-syntax keyword potionKeyword if elsif else
-syntax keyword potionKeyword class return
-
-syntax keyword potionFunction print join string
-
-syntax match potionComment "\v#.*$"
-
-syntax match potionOperator "\v\*"
-syntax match potionOperator "\v/\="
-syntax match potionOperator "\v\+"
-syntax match potionOperator "\v-"
-syntax match potionOperator "\v/"
-syntax match potionOperator "\v\*\="
-syntax match potionOperator "\v\+\="
-syntax match potionOperator "\v-\="
-syntax match potionOperator "\v\?"
-
-syntax region potionString start=/\v"/ skip=/\v\\./ end=/\v"/
-syntax region potionString start=/\v'/ skip=/\v\\./ end=/\v'/
-
-highlight link potionKeyword Keyword
-highlight link potionFunction Function
-highlight link potionOperator Operator
-highlight link potionComment Comment
-highlight link potionString String
-
-let b:current_syntax = "potion"
-
--- a/vim/bundle/puppet/ftdetect/puppet.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-au BufRead,BufNewFile *.pp setfiletype puppet
--- a/vim/bundle/puppet/syntax/puppet.vim Fri Jan 20 11:57:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-" puppet syntax file
-" Filename: puppet.vim
-" Language: puppet configuration file
-" Maintainer: Luke Kanies <luke@madstop.com>
-" URL:
-" Last Change:
-" Version:
-"
-
-" Copied from the cfengine, ruby, and perl syntax files
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-endif
-
-syn region puppetDefine start="^\s*\(class\|define\|site\|node\)" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments
-syn keyword puppetDefType class define site node inherits contained
-syn keyword puppetInherits inherits contained
-syn region puppetDefArguments start="(" end=")" contains=puppetArgument
-syn match puppetArgument "\w\+" contained
-syn match puppetArgument "\$\w\+" contained
-syn match puppetArgument "'[^']+'" contained
-syn match puppetArgument '"[^"]+"' contained
-syn match puppetDefName "\w\+" contained
-
-syn match puppetInstance "\w\+\s*{" contains=puppetTypeBrace,puppetTypeName,puppetTypeDefault
-syn match puppetTypeBrace "{" contained
-syn match puppetTypeName "[a-z]\w*" contained
-syn match puppetTypeDefault "[A-Z]\w*" contained
-
-syn match puppetParam "\w\+\s*=>" contains=puppetTypeRArrow,puppetParamName
-syn match puppetParamRArrow "=>" contained
-syn match puppetParamName "\w\+" contained
-syn match puppetVariable "$\w\+"
-syn match puppetVariable "${\w\+}"
-syn match puppetParen "("
-syn match puppetParen ")"
-syn match puppetBrace "{"
-syn match puppetBrace "}"
-
-syn region puppetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=puppetVariable
-
-syn keyword puppetBoolean true false
-syn keyword puppetKeyword import inherits include
-syn keyword puppetControl case default
-
-" comments last overriding everything else
-syn match puppetComment "\s*#.*$" contains=puppetTodo
-syn keyword puppetTodo TODO NOTE FIXME XXX contained
-
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_puppet_syn_inits")
- if version < 508
- let did_puppet_syn_inits = 1
- command -nargs=+ HiLink hi link <args>
- else
- command -nargs=+ HiLink hi def link <args>
- endif
-
- HiLink puppetVariable Identifier
- HiLink puppetBoolean Boolean
- HiLink puppetType Identifier
- HiLink puppetDefault Identifier
- HiLink puppetKeyword Define
- HiLink puppetTypeDefs Define
- HiLink puppetComment Comment
- HiLink puppetString String
- HiLink puppetTodo Todo
-" HiLink puppetBrace Delimiter
-" HiLink puppetTypeBrace Delimiter
-" HiLink puppetParen Delimiter
- HiLink puppetDelimiter Delimiter
- HiLink puppetControl Statement
- HiLink puppetDefType Define
- HiLink puppetDefName Type
- HiLink puppetTypeName Statement
- HiLink puppetTypeDefault Type
- HiLink puppetParamName Identifier
- HiLink puppetArgument Identifier
-
- delcommand HiLink
-endif
-
-let b:current_syntax = "puppet"
--- a/vim/vimrc Fri Jan 20 11:57:07 2017 +0000
+++ b/vim/vimrc Fri Jan 20 12:12:18 2017 +0000
@@ -1636,44 +1636,6 @@
augroup END
" }}}
-" Scala {{{
-
-function! DispatchMavenTest()
- let view = winsaveview()
- let zreg = @z
-
- " Move to the top of the file
- normal! gg
-
- " Find the spec name
- call search('\vclass (.*Spec)')
- normal! w"zyiw
-
- let spec = @z
-
- execute "Dispatch mvn -q -B test -Dtest=" . spec
-
- let @z = zreg
- call winrestview(view)
-endfunction
-
-augroup ft_scala
- au!
- au Filetype scala setlocal foldmethod=marker foldmarker={,}
- au Filetype scala setlocal textwidth=100
- au Filetype scala setlocal shiftwidth=2
- au Filetype scala compiler maven
- au Filetype scala let b:dispatch = 'mvn -B package install'
- au Filetype scala nnoremap <buffer> <localleader>s mz:%!sort-scala-imports<cr>`z
- au Filetype scala nnoremap <buffer> M :call scaladoc#Search(expand("<cword>"))<cr>
- au Filetype scala vnoremap <buffer> M "ry:call scaladoc#Search(@r)<cr>
- au Filetype scala nnoremap <buffer> <localleader>t :call DispatchMavenTest()<cr>
- au Filetype scala nmap <buffer> <localleader>( ysiwbi
- au Filetype scala nmap <buffer> <localleader>[ ysiwri
- ")]
-augroup END
-
-" }}}
" Scheme {{{
function! OpenSchemeRepl() "{{{
@@ -2151,11 +2113,6 @@
nnoremap <leader>u V:Gbrowse @upstream<cr>
" }}}
-" GnuPG {{{
-
-let g:GPGPreferArmor = 1
-
-" }}}
" Gundo {{{
nnoremap <F5> :GundoToggle<CR>
@@ -2174,17 +2131,6 @@
let g:atia_attributes_complete = 0
" }}}
-" Linediff {{{
-
-vnoremap <leader>l :Linediff<cr>
-nnoremap <leader>L :LinediffReset<cr>
-
-" }}}
-" Maven {{{
-
-let g:maven_disable_mappings = 1
-
-" }}}
" MiniYank {{{
map p <Plug>(miniyank-autoput)