flatten vim dir

diff --git a/vim/compiler/lilypond.vim b/vim/compiler/lilypond.vim
deleted file mode 100644 (file)
index c0c6c7d..0000000
--- a/vim/compiler/lilypond.vim
+++ /dev/null
@@ -1,17 +0,0 @@
-" LilyPond compiler file
-" Language:     LilyPond
-" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
-" Last Change:  2004 Mar 01
-
-" 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
-"

diff --git a/vim/ftplugin/lilypond.vim b/vim/ftplugin/lilypond.vim
deleted file mode 100644 (file)
index 46470cc..0000000
--- a/vim/ftplugin/lilypond.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-" LilyPond filetype plugin
-" Language:     LilyPond (ft=ly)
-" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
-" Last Change:  2004 March 1
-
-" 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
-map <buffer> <F4> :w<Return>:se makeprg=lilypond\ -m\ %<<Return>:make<Return>:!timidity %<.midi<Return>
-"
-" <F5>  save & make dvi, midi, ps
-map <buffer> <F5> :w<Return>:se makeprg=lilypond\ %<<Return>:make<Return>
-"
-" <F6>  view ps
-map <buffer> <F6> :!gv -watch %<.ps &<Return>
-"
-" <S-F6>  view dvi
-map <buffer> <S-F6> :!xdvi %<.dvi &<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.el dictionary+=~/.vim/syntax/lilypond.words.el
-setlocal complete-=k complete+=k
-"
-setlocal showmatch

diff --git a/vim/indent/lilypond.vim b/vim/indent/lilypond.vim
deleted file mode 100644 (file)
index e2426d6..0000000
--- a/vim/indent/lilypond.vim
+++ /dev/null
@@ -1,32 +0,0 @@
-" LilyPond indent file
-" Language:     LilyPond
-" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
-" Last Change:  2004 Mar 01
-
-" 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()
-
-" 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)
-  let ind = indent(lnum)
-
-  return ind
-endfunction
-"
-"
-"

diff --git a/vim/lilypond-compiler.vim b/vim/lilypond-compiler.vim
new file mode 100644 (file)
index 0000000..c0c6c7d
--- /dev/null
+++ b/vim/lilypond-compiler.vim
@@ -0,0 +1,17 @@
+" LilyPond compiler file
+" Language:     LilyPond
+" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
+" Last Change:  2004 Mar 01
+
+" 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
+"

diff --git a/vim/lilypond-ftpplugin.vim b/vim/lilypond-ftpplugin.vim
new file mode 100644 (file)
index 0000000..46470cc
--- /dev/null
+++ b/vim/lilypond-ftpplugin.vim
@@ -0,0 +1,57 @@
+" LilyPond filetype plugin
+" Language:     LilyPond (ft=ly)
+" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
+" Last Change:  2004 March 1
+
+" 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
+map <buffer> <F4> :w<Return>:se makeprg=lilypond\ -m\ %<<Return>:make<Return>:!timidity %<.midi<Return>
+"
+" <F5>  save & make dvi, midi, ps
+map <buffer> <F5> :w<Return>:se makeprg=lilypond\ %<<Return>:make<Return>
+"
+" <F6>  view ps
+map <buffer> <F6> :!gv -watch %<.ps &<Return>
+"
+" <S-F6>  view dvi
+map <buffer> <S-F6> :!xdvi %<.dvi &<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.el dictionary+=~/.vim/syntax/lilypond.words.el
+setlocal complete-=k complete+=k
+"
+setlocal showmatch

diff --git a/vim/lilypond-indent.vim b/vim/lilypond-indent.vim
new file mode 100644 (file)
index 0000000..e2426d6
--- /dev/null
+++ b/vim/lilypond-indent.vim
@@ -0,0 +1,32 @@
+" LilyPond indent file
+" Language:     LilyPond
+" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
+" Last Change:  2004 Mar 01
+
+" 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()
+
+" 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)
+  let ind = indent(lnum)
+
+  return ind
+endfunction
+"
+"
+"

diff --git a/vim/lilypond-syntax.vim b/vim/lilypond-syntax.vim
new file mode 100644 (file)
index 0000000..a69f30c
--- /dev/null
+++ b/vim/lilypond-syntax.vim
@@ -0,0 +1,78 @@
+" Vim syntax file
+" Language:    LilyPond
+" Maintainer:  Heikki Junes <hjunes@cc.hut.fi>
+" Created:      Oct 17, 2002
+" Last Change: Sep 23, 2003
+" Version:     6.1-1
+" Latest:
+" http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lilypond.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,lilyEquation,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyReservedWord
+
+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 lilyEquation "\(#['`]\)\?\(\a*[-]\)*\a*\s*=\s*\(#[#'`]\?\)\?\a*"
+syn match lilySlur     "[(~)]"
+syn match lilySlur     "\\[()]"
+syn match lilySpecial  "\\[<!>\\]"
+
+" 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 lilyKeyword   Keyword
+  HiLink lilyReservedWord      Type
+
+  HiLink lilyNumber    Constant
+  HiLink lilySpecial   Special
+  HiLink lilySlur      ModeMsg
+
+  delcommand HiLink
+endif

diff --git a/vim/syntax/lilypond.vim b/vim/syntax/lilypond.vim
deleted file mode 100644 (file)
index a69f30c..0000000
--- a/vim/syntax/lilypond.vim
+++ /dev/null
@@ -1,78 +0,0 @@
-" Vim syntax file
-" Language:    LilyPond
-" Maintainer:  Heikki Junes <hjunes@cc.hut.fi>
-" Created:      Oct 17, 2002
-" Last Change: Sep 23, 2003
-" Version:     6.1-1
-" Latest:
-" http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lilypond.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,lilyEquation,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyReservedWord
-
-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 lilyEquation "\(#['`]\)\?\(\a*[-]\)*\a*\s*=\s*\(#[#'`]\?\)\?\a*"
-syn match lilySlur     "[(~)]"
-syn match lilySlur     "\\[()]"
-syn match lilySpecial  "\\[<!>\\]"
-
-" 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 lilyKeyword   Keyword
-  HiLink lilyReservedWord      Type
-
-  HiLink lilyNumber    Constant
-  HiLink lilySpecial   Special
-  HiLink lilySlur      ModeMsg
-
-  delcommand HiLink
-endif