X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=vimrc;h=7cfa170a401f07fb0fbccf5a1f25a4e93fd56833;hb=e421edccdc9aa2dbcdea52bdc35149d35997d224;hp=aec7d6e04a89788746adc5d05ae05c2d82302a74;hpb=8a64b0b9530adcade35e47738635b4c3d510639b;p=lilypond.git

diff --git a/vimrc b/vimrc
index aec7d6e04a..7cfa170a40 100644
--- a/vimrc
+++ b/vimrc
@@ -1,38 +1,45 @@
-:version 4.0
+:version 6.1
 set autoindent
 set shiftwidth=2
-set tags=$LILYPOND_SOURCEDIR/flower/tags,$LILYPOND_SOURCEDIR/flower/include/tags,$LILYPOND_SOURCEDIR/lib/tags,$LILYPOND_SOURCEDIR/lib/include/tags,$LILYPOND_SOURCEDIR/lily/tags,$LILYPOND_SOURCEDIR/lily/include/tags
 "
 " some handy key mappings
 "
-" F4  save & make and play midi
-map <F4> :w
:se makeprg=ly2dvi\ -m\ %<
:make
:!timidity %<.midi
+" <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
:se makeprg=ly2dvi\ -P\ %<
:make
+" <F5>  save & make dvi, midi, ps
+map <F5> :w<Return>:se makeprg=lilypond\ -P\ %<<Return>:make<Return>
 "
-" F6  view ps
-map <F6> :!gv -watch %<.ps &
+" <F6>  view ps
+map <F6> :!gv -watch %<.ps &<Return>
 "
-" F7  prev error
-map [18~ :cp
+" <S-F6>  view dvi
+map <S-F6> :!xdvi %<.dvi &<Return>
 "
-" F8  next error
-map [19~ :cn
+" <F7>  prev error
+map <F7> :cp<Return>
 "
-" F9  make
-map [20~ :w
:se makeprg=make\ -k
:make
+" <F8>  next error
+map <F8> :cn<Return>
 "
-" F10 run buffer through lily
-map [21~ :w
:se makeprg=lilypond\ %:t
:make
+" <F9>  make
+map <F9> :w<Return>:se makeprg=make\ -k<Return>:make<Return>
 "
-" F11 check buffer for quarts
-map [23~ :w
:se makeprg=lilypond\ -Q\ %:t
:make
+" <F10> run buffer through lily
+map <F10> :w<Return>:se makeprg=lilypond\ %:t<Return>:make<Return>
 "
-" shift F10: run buffer through lily -M
-map [34~ :w
:se makeprg=lilypond\ -M\ %:t
:make
+" <S-F10> run buffer through lily -M
+map <S-F10> :w<Return>:se makeprg=lilypond\ -M\ %:t<Return>:make<Return>
 "
+" <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?)
 "