X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=vim%2Flilypond-ftplugin.vim;h=0c3a8dc7e2582547a5a56261d4c9d1f5b633e1b3;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=fa69f49ebda260693c307be185774feedb989761;hpb=e3c9620c20174bd54c523a9bd892bb4666efc400;p=lilypond.git

diff --git a/vim/lilypond-ftplugin.vim b/vim/lilypond-ftplugin.vim
index fa69f49ebd..0c3a8dc7e2 100644
--- a/vim/lilypond-ftplugin.vim
+++ b/vim/lilypond-ftplugin.vim
@@ -1,10 +1,8 @@
 " LilyPond filetype plugin
 " Language:     LilyPond (ft=ly)
-" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
-" Last Change:  2004 March 1
 "
 " Installed As:	vim/ftplugin/lilypond.vim
-" Uses Generated File:	vim/syntax/lilypond.words.el
+" Uses Generated File:	vim/syntax/lilypond-words.vim
 "
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -19,17 +17,14 @@ 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>
+" <F4>  save & make and play midi with timidity
+map <buffer> <F4> :w<Return>:setl makeprg=lilypond\ \"%<\"<Return>:make<Return>:!timidity "%<.midi"<Return>
 "
-" <F5>  save & make dvi, midi, ps
-map <buffer> <F5> :w<Return>:se makeprg=lilypond\ %<<Return>:make<Return>
+" <F5>  save & make
+map <buffer> <F5> :w<Return>:setl 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>
+" <F6>  view pdf with ghostview
+map <buffer> <F6> :!gv --watch "%<.pdf" &<Return>
 "
 " <F7>  prev error
 map <buffer> <F7> :cp<Return>
@@ -38,7 +33,7 @@ map <buffer> <F7> :cp<Return>
 map <buffer> <F8> :cn<Return>
 "
 " <F9>  make
-map <buffer> <F9> :w<Return>:se makeprg=make\ -k<Return>:make<Return>
+map <buffer> <F9> :w<Return>:setl makeprg=make\ -k<Return>:make<Return>
 "
 " <F10> menu
 source $VIMRUNTIME/menu.vim
@@ -54,7 +49,7 @@ map <buffer> <F12> :g!/%.*/normal 0i%<Return>
 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 dictionary-=$VIM/syntax/lilypond-words dictionary+=$VIM/syntax/lilypond-words
 setlocal complete-=k complete+=k
 "
 setlocal showmatch