diff --git a/vimfiles.stefan/compiler/gcc.vim b/vimfiles.stefan/compiler/gcc.vim index 974212d..806347c 100644 --- a/vimfiles.stefan/compiler/gcc.vim +++ b/vimfiles.stefan/compiler/gcc.vim @@ -34,6 +34,7 @@ setlocal errorformat+=%C\ \ \ \ %m " Tools " ----- setlocal errorformat+=%+G%.%#.exe:\ %m +setlocal errorformat+=%+G%.%#.exe[%*\\d]:\ ***\ %m " Error format from other programs: ...: ... "setlocal errorformat+=%+G%f:\ %m diff --git a/vimfiles.stefan/ftplugin/vim.vim b/vimfiles.stefan/ftplugin/vim.vim index 05786e4..03fc8e0 100644 --- a/vimfiles.stefan/ftplugin/vim.vim +++ b/vimfiles.stefan/ftplugin/vim.vim @@ -10,7 +10,7 @@ setlocal softtabstop=4 setlocal formatoptions=croq " vimfiles sollen immer im unix-Format gespeichert werden -if filereadable('%') +if filewritable(expand('%')) setlocal fileformat=unix endif diff --git a/vimfiles.stefan/plugin/bmsk.vim b/vimfiles.stefan/plugin/bmsk.vim index 382ce3b..ae884f4 100644 --- a/vimfiles.stefan/plugin/bmsk.vim +++ b/vimfiles.stefan/plugin/bmsk.vim @@ -119,8 +119,8 @@ function s:BmskRedrawMenu() \' :SetSWStand' " Compile exec 'anoremenu .30.10 '.s:BMSKmenuname. - \'&Compile.&Build:Bmsk'. - \' :Bmsk' + \'&Compile.&Build:Make'. + \' :Make' exec 'anoremenu ..20 '.s:BMSKmenuname. \'&Compile.&Alle\ Teststände:BmskAll\ Test'. \' :BmskAll Test' @@ -128,17 +128,17 @@ function s:BmskRedrawMenu() \'&Compile.&Lint:Lint'. \' :Lint' exec 'anoremenu ..35 '.s:BMSKmenuname. - \'&Compile.&Doku\ erstellen:Bmsk\ doku'. - \' :Bmsk doku' + \'&Compile.&Doku\ erstellen:Make\ doku'. + \' :Make doku' exec 'anoremenu ..36 '.s:BMSKmenuname. \'&Compile.&Einzeldoku\ erstellen:BmskDoku\ doku\ funktionen="\.\.\."'. \' :BmskDoku' exec 'anoremenu ..40 '.s:BMSKmenuname. - \'&Compile.&Clean:Bmsk\ clean'. - \' :Bmsk clean' + \'&Compile.&Clean:Make\ clean'. + \' :Make clean' exec 'anoremenu ..45 '.s:BMSKmenuname. - \'&Compile.&Clean\ all:Bmsk\ distclean'. - \' :Bmsk distclean' + \'&Compile.&Clean\ all:Make\ distclean'. + \' :Make distclean' exec 'anoremenu ..50 '. s:BMSKmenuname. \'&Compile.-sep- :' exec 'anoremenu ..60 '.s:BMSKmenuname. @@ -196,11 +196,11 @@ function s:BmskRedrawMenu() \'&Search.List\ &CTags:tselect'. \' :tselect /' exec 'anoremenu ..50 '.s:BMSKmenuname. - \'&Search.Update\ c&tags:Bmsk\ ctags'. - \' :Bmsk ctags' + \'&Search.Update\ c&tags:Make\ ctags'. + \' :Make ctags' exec 'anoremenu ..60 '.s:BMSKmenuname. - \'&Search.Update\ C&scope:Bmsk\ cscope'. - \' :Bmsk cscope' + \'&Search.Update\ C&scope:Make\ cscope'. + \' :Make cscope' exec 'anoremenu ..70 '.s:BMSKmenuname. \'&Search.Disconnect\ C&scope:cscope\ kill\ -1'. \' :cscope kill -1' @@ -719,7 +719,7 @@ function s:BmskAll(Stand) if (a:Stand != '') && (g:SW_Stand != a:Stand) call SetSWStand(a:Stand) endif - execute 'Bmsk all' . g:SW_Stand + execute 'Make all' . g:SW_Stand endfunction " Alle Software-Stände als VimList @@ -869,7 +869,7 @@ command TaskReport call s:TaskReport() function s:TaskReport() let b:browsefilter = 'Textfiles \t*.txt\n' let file = browse(1, 'Select File for Task Report', 'c:', g:bmskProject . '.txt') - execute 'Bmsk ccm_task_report file=' . fnamemodify(file, ':p') + execute 'Make ccm_task_report file=' . fnamemodify(file, ':p') endfunction " ------------------------------------------ diff --git a/vimfiles.stefan/plugin/changelog.vim b/vimfiles.stefan/plugin/changelog.vim index 361b8f4..bdf82ff 100644 --- a/vimfiles.stefan/plugin/changelog.vim +++ b/vimfiles.stefan/plugin/changelog.vim @@ -19,6 +19,7 @@ function s:ReportRev(Rev) echo 'Tags für BMS-X' echo 'Doxygen Toolkit' echo 'Update VimScripts' + echo 'das Verzeichnis vimfiles kann ohne Anpassung verwendet werden' elseif a:Rev >= '128' echo 'Neu seit Rev: 128' echo 'Vimsuite für BMS-X verbessert' diff --git a/vimfiles.stefan/plugin/tools.vim b/vimfiles.stefan/plugin/tools.vim index c92b6dc..eda1d91 100644 --- a/vimfiles.stefan/plugin/tools.vim +++ b/vimfiles.stefan/plugin/tools.vim @@ -469,17 +469,17 @@ function s:RedrawMenu() call s:RedrawSessionMenu() " Compile exec 'anoremenu '.s:VimSuiteMenuLocation.'.30 '.s:VimSuiteMenuName. - \'&Compile.&Build:make'. - \' :make' + \'&Compile.&Build:Make'. + \' :Make' exec 'anoremenu '.s:VimSuiteMenuLocation.'.30 '.s:VimSuiteMenuName. - \'&Compile.&Lint:make\ lint'. - \' :make lint' + \'&Compile.&Lint:Make\ lint'. + \' :Make lint' exec 'anoremenu '.s:VimSuiteMenuLocation.'.30 '.s:VimSuiteMenuName. - \'&Compile.&Clean:make\ clean'. - \' :make clean' + \'&Compile.&Clean:Make\ clean'. + \' :Make clean' exec 'anoremenu '.s:VimSuiteMenuLocation.'.30 '.s:VimSuiteMenuName. - \'&Compile.&Run:make\ run'. - \' :make run' + \'&Compile.&Run:Make\ run'. + \' :Make run' " exec 'anoremenu '.s:VimSuiteMenuLocation.'.30 '. s:VimSuiteMenuName. " \'&Compile.-sep- :' " Search @@ -501,8 +501,8 @@ function s:RedrawMenu() \'&Search.List\ &CTags:tselect'. \' :tselect /' exec 'anoremenu '.s:VimSuiteMenuLocation.'.40 '.s:VimSuiteMenuName. - \'&Search.Update\ c&tags:make\ tags'. - \' :make tags' + \'&Search.Update\ c&tags:Make\ tags'. + \' :Make tags' " Edit exec 'anoremenu '.s:VimSuiteMenuLocation.'.50 '.s:VimSuiteMenuName. \'&Edit.&Comment\ out/in^k'. diff --git a/vimfiles.stefan/vimrc b/vimfiles.stefan/vimrc index 595949e..0293eaa 100644 --- a/vimfiles.stefan/vimrc +++ b/vimfiles.stefan/vimrc @@ -1,5 +1,4 @@ " Setzen des Runtimepath, in dem die Vimfiles gesucht werden: -let &runtimepath = $VIMRUNTIME let &runtimepath = &runtimepath . ',' . g:vimsuite . '/vimfiles' let &runtimepath = &runtimepath . ',' . g:vimsuite . '/vimfiles.latex' let &runtimepath = &runtimepath . ',' . g:vimsuite . '/HTML'