* vimrc: add menu in console and shortcut <F10> for it.
+ * vim/:
+ * vim/syntax:
+ * vim/ftplugin: new directories.
+
+ * vim/filetype.vim: new file.
+
+ * lilypond.vim: remove files (see next).
+ * vim/syntax/lilypond.vim: new, renamed file (see prev).
+
+ * vimrc: remove file (see next).
+ * vim/ftplugin/lilypond.vim: new, renamed file (see prev).
+
2004-02-29 Jan Nieuwenhuizen <janneke@gnu.org>
* stepmake/aclocal.m4: Store computed version in variable.
+++ /dev/null
-" 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
-set 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
--- /dev/null
+:version 6.1
+set autoindent
+set shiftwidth=2
+"
+" some handy key mappings
+"
+" <F2> save and go to previous buffer
+map <F2> :w<Return>:bp<Return>
+"
+" <F3> save and go to next buffer
+map <F3> :w<Return>:bn<Return>
+"
+" <F4> save & make and play midi
+map <F4> :w<Return>:se makeprg=lilypond\ -m\ %<<Return>:make<Return>:!timidity %<.midi<Return>
+"
+" <F5> save & make dvi, midi, ps
+map <F5> :w<Return>:se makeprg=lilypond\ %<<Return>:make<Return>
+"
+" <F6> view ps
+map <F6> :!gv -watch %<.ps &<Return>
+"
+" <S-F6> view dvi
+map <S-F6> :!xdvi %<.dvi &<Return>
+"
+" <F7> prev error
+map <F7> :cp<Return>
+"
+" <F8> next error
+map <F8> :cn<Return>
+"
+" <F9> make
+map <F9> :w<Return>:se makeprg=make\ -k<Return>:make<Return>
+"
+" <F10> menu
+:source $VIMRUNTIME/menu.vim
+:set wildmenu
+:set cpo-=<
+:set wcm=<C-Z>
+:map <F10> :emenu <C-Z>
+"
+" <F12> comment region
+map <F12> :g!/%.*/normal 0i%<Return>
+"
+" <S-F12> remove comments in region
+map <S-F12> :g/%.*/normal 0x<Return>
+"
+" Completions in Insert/Replace-mode with <Ctrl-N>
+set dictionary-=~/.vim/lilypond.words.el dictionary+=~/.vim/lilypond.words.el
+set complete-=k complete+=k
+" errorformat for lily (with columns) and gcc
+" (how to see multiple-line error messages?)
+"
+se errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,In\ file\ included\ from\ %f:%l:,\^I\^Ifrom\ %f:%l%m
+
--- /dev/null
+" 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
+set 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
+++ /dev/null
-:version 6.1
-set autoindent
-set shiftwidth=2
-"
-" some handy key mappings
-"
-" <F2> save and go to previous buffer
-map <F2> :w<Return>:bp<Return>
-"
-" <F3> save and go to next buffer
-map <F3> :w<Return>:bn<Return>
-"
-" <F4> save & make and play midi
-map <F4> :w<Return>:se makeprg=lilypond\ -m\ %<<Return>:make<Return>:!timidity %<.midi<Return>
-"
-" <F5> save & make dvi, midi, ps
-map <F5> :w<Return>:se makeprg=lilypond\ %<<Return>:make<Return>
-"
-" <F6> view ps
-map <F6> :!gv -watch %<.ps &<Return>
-"
-" <S-F6> view dvi
-map <S-F6> :!xdvi %<.dvi &<Return>
-"
-" <F7> prev error
-map <F7> :cp<Return>
-"
-" <F8> next error
-map <F8> :cn<Return>
-"
-" <F9> make
-map <F9> :w<Return>:se makeprg=make\ -k<Return>:make<Return>
-"
-" <F10> menu
-:source $VIMRUNTIME/menu.vim
-:set wildmenu
-:set cpo-=<
-:set wcm=<C-Z>
-:map <F10> :emenu <C-Z>
-"
-" <F12> comment region
-map <F12> :g!/%.*/normal 0i%<Return>
-"
-" <S-F12> remove comments in region
-map <S-F12> :g/%.*/normal 0x<Return>
-"
-" Completions in Insert/Replace-mode with <Ctrl-N>
-set dictionary-=~/.vim/lilypond.words.el dictionary+=~/.vim/lilypond.words.el
-set complete-=k complete+=k
-" errorformat for lily (with columns) and gcc
-" (how to see multiple-line error messages?)
-"
-se errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,In\ file\ included\ from\ %f:%l:,\^I\^Ifrom\ %f:%l%m
-
projects / lilypond.git / commitdiff