diff --git a/vimfiles.damos/syntax/kgs.vim b/vimfiles.damos/syntax/kgs.vim index ed7e4db..e422fcf 100644 --- a/vimfiles.damos/syntax/kgs.vim +++ b/vimfiles.damos/syntax/kgs.vim @@ -10,17 +10,34 @@ execute('source ' . $VIMRUNTIME . '/syntax/c.vim') "syntax keyword kgsFunctions sg_funktion contained syntax keyword kgsFunctions sg_funktion variante revision syntax keyword kgsDefinitions fkt_bezeichner kgs_bezeichner ram_bezeichner -syntax keyword kgsDefinitions ram_groesse lok_ram_groesse kennwert kennlinie -syntax keyword kgsDefinitions gruppenkennlinie gruppenkennfeld gruppenstuetzstellen -syntax keyword kgsDefinitions kennfeld kennwerteblock systemkonstante festkennlinie -syntax keyword kgsDefinitions festkennfeld -syntax keyword kgsDefinitions kenngroessen_gruppe ram_groessen_gruppe -syntax keyword kgsDefinitions lok_kenngroessen_gruppe lok_ram_groessen_gruppe -syntax keyword kgsRefgroessen ref_ram_groesse -syntax keyword kgsRefgroessen ref_kennwert ref_kennlinie ref_kennfeld -syntax keyword kgsRefgroessen ref_gruppenstuetzstellen + +syntax keyword kgsDefinitions systemkonstante syntax keyword kgsRefgroessen ref_systemkonstante +syntax keyword kgsDefinitions ram_groesse lok_ram_groesse +syntax keyword kgsRefgroessen ref_ram_groesse +syntax keyword kgsDefinitions kennwert lok_kennwert +syntax keyword kgsRefgroessen ref_kennwert +syntax keyword kgsDefinitions kennwerteblock lok_kennwerteblock syntax keyword kgsRefgroessen ref_kennwerteblock +syntax keyword kgsDefinitions kennlinie lok_kennlinie +syntax keyword kgsRefgroessen ref_kennlinie +syntax keyword kgsDefinitions kennfeld lok_kennfeld +syntax keyword kgsRefgroessen ref_kennfeld +syntax keyword kgsDefinitions festkennlinie lok_festkennlinie +syntax keyword kgsRefgroessen ref_festkennlinie +syntax keyword kgsDefinitions festkennfeld lok_festkennfeld +syntax keyword kgsRefgroessen ref_festkennfeld +syntax keyword kgsDefinitions gruppenkennlinie lok_gruppenkennlinie +syntax keyword kgsRefgroessen ref_gruppenkennlinie +syntax keyword kgsDefinitions gruppenkennfeld lok_gruppenkennfeld +syntax keyword kgsRefgroessen ref_gruppenkennfeld +syntax keyword kgsDefinitions gruppenstuetzstellen lok_gruppenstuetzstellen +syntax keyword kgsRefgroessen ref_gruppenstuetzstellen +syntax keyword kgsDefinitions kenngroessen_gruppe lok_kenngroessen_gruppe +syntax keyword kgsRefgroessen ref_kenngroessen_gruppe +syntax keyword kgsDefinitions ram_groessen_gruppe lok_ram_groessen_gruppe +syntax keyword kgsRefgroessen ref_ram_groessen_gruppe + syntax keyword kgsKomponents umrechnung codesyntax datentyp adressierschema syntax keyword kgsKomponents bitanzahl element_anzahl bitbasis_typ bitposition syntax keyword kgsKomponents bitbasis_name init_wertp minp_w maxp_w diff --git a/vimfiles.stefan/colors/Stefan.vim b/vimfiles.stefan/colors/Stefan.vim index 57f037c..332fec5 100644 --- a/vimfiles.stefan/colors/Stefan.vim +++ b/vimfiles.stefan/colors/Stefan.vim @@ -47,9 +47,9 @@ hi NonText term=NONE cterm=NONE ctermfg=Blue gui=NO hi Directory term=bold ctermfg=Blue guifg=Blue hi ErrorMsg term=standout cterm=bold ctermfg=Grey ctermbg=Red gui=bold guifg=White guibg=LightRed hi IncSearch term=reverse cterm=reverse gui=reverse -hi Search term=reverse ctermbg=Brown guifg=Black guibg=LightGreen +hi Search term=reverse ctermbg=Brown guibg=Green hi MoreMsg term=bold ctermfg=Grey gui=bold guifg=White -hi ModeMsg term=bold cterm=bold gui=bold guifg=Black +hi ModeMsg term=bold cterm=bold gui=bold guifg=LightGrey hi LineNr term=underline ctermfg=Yellow guifg=Orange guibg=SeaGreen hi Question term=standout ctermfg=Grey gui=bold guifg=White hi StatusLine term=bold,reverse cterm=bold,reverse gui=bold guifg=White guibg=Black @@ -59,8 +59,8 @@ hi Title term=bold ctermfg=Magenta gui=bo hi Visual term=reverse cterm=reverse gui=reverse guibg=Black hi VisualNOS term=bold,underline cterm=bold,underline gui=bold,underline hi WarningMsg term=standout ctermfg=Red gui=bold guifg=Red guibg=LightGreen -hi WildMenu term=standout ctermfg=Black ctermbg=Brown guifg=Black guibg=Yellow -hi Folded term=standout ctermfg=Black ctermbg=DarkGreen guifg=Black guibg=DarkGreen +hi WildMenu term=standout ctermfg=Black ctermbg=Brown guifg=LightGrey guibg=Yellow +hi Folded term=standout ctermfg=Black ctermbg=DarkGreen guifg=LightGrey guibg=DarkGreen hi FoldColumn term=standout ctermfg=Blue ctermbg=Grey guifg=DarkBlue guibg=Gray80 hi DiffAdd term=bold ctermbg=Red guibg=Red hi DiffChange term=bold ctermbg=Magenta guibg=DarkGreen @@ -71,7 +71,7 @@ hi lCursor " Colors for syntax highlighting hi Comment term=bold ctermfg=DarkYellow gui=NONE guifg=Yellow -hi Constant term=underline ctermfg=DarkMagenta guifg=Black +hi Constant term=underline ctermfg=DarkMagenta guifg=LightGrey hi Special term=bold ctermfg=Blue guifg=Blue hi Identifier term=underline ctermfg=DarkCyan guifg=Cyan hi Statement term=bold ctermfg=DarkCyan gui=bold guifg=Cyan @@ -86,7 +86,7 @@ hi Underlined term=underline cterm=underline ctermfg=Blue gui=un hi MatchParen term=reverse guibg=Blue hi StdFunction gui=bold guifg=LightGreen -hi Operator gui=NONE guifg=Black +hi Operator gui=NONE guifg=LightGrey hi OperatorBold gui=bold guifg=Magenta hi StdName gui=bold guifg=Magenta hi Name gui=NONE guifg=LightGray @@ -99,3 +99,6 @@ hi DiffAdd ctermbg=DarkBlue hi DiffChange ctermbg=DarkBlue hi DiffText ctermbg=Red ctermfg=DarkBlue "hi DiffDelete + +" Netrw +hi netrwMarkFile gui=bold guifg=Magenta diff --git a/vimfiles.stefan/ftplugin/hex.vim b/vimfiles.stefan/ftplugin/hex.vim index 9ce9d3c..7bc3bd2 100644 --- a/vimfiles.stefan/ftplugin/hex.vim +++ b/vimfiles.stefan/ftplugin/hex.vim @@ -21,7 +21,7 @@ function! s:HexParseLine(line) \'Address': Address, \'Type': Type, \'Data': Data, - \'Checksum': Checksum, + \'Checksum': Checksum \} return LineDict endfunction @@ -67,14 +67,19 @@ endfunction " Get Address of current cursor position function! s:HexGetAddress() - let LineAddress = s:HexGetLineAddress() - let LineAddressOffset = s:HexGetDataByte() + try + let LineAddress = s:HexGetLineAddress() + let LineAddressOffset = s:HexGetDataByte() - let Address = eval( - \ ' ( '.LineAddress.')' - \ .'+( '.LineAddressOffset.')' - \ ) - return printf('0x%x', Address) + let Address = eval( + \ ' ( '.LineAddress.')' + \ .'+( '.LineAddressOffset.')' + \ ) + let HexAddress = printf('0x%x', Address) + catch + let HexAddress = 'unknown' + endtry + return HexAddress endfunction " Split data string in List of byte strings @@ -85,14 +90,18 @@ endfunction " Get ASCII representation of current data function! s:HexGetAsciiLine() - let String = '' - let LineDict = s:HexParseLine(getline(line('.'))) - let Data = LineDict['Data'] - let DataList = HexSplitData(Data) - for Byte in DataList - let ByteVal = eval('0x'.Byte) - let String .= nr2char(ByteVal) - endfor + try + let String = '' + let LineDict = s:HexParseLine(getline(line('.'))) + let Data = LineDict['Data'] + let DataList = HexSplitData(Data) + for Byte in DataList + let ByteVal = eval('0x'.Byte) + let String .= nr2char(ByteVal) + endfor + catch + let String = '?' + endtry return String endfunction @@ -112,17 +121,22 @@ function! HexGetVal(Bytes) return eval('0x'.HexString) else return -1 + endif endfunction " Get actual values for 1, 2, 4 Bytes in hex and dez function! s:HexGetDezValuesString() - let String = '' - for i in [1, 2, 4] - let Byte = HexGetVal(i) - if Byte != -1 - let String .= ' ' . printf('0x%x (%d)', Byte, Byte) - endif - endfor + try + let String = '' + for i in [1, 2, 4] + let Byte = HexGetVal(i) + if Byte != -1 + let String .= ' ' . printf('0x%x (%d)', Byte, Byte) + endif + endfor + catch + let String = '?' + endtry return String endfunction @@ -133,8 +147,8 @@ function! HexStatusLine() \ . s:HexGetAddress() \ . ' Values: ' \ . s:HexGetDezValuesString() -" \ . ' Data: ' -" \ . s:HexGetAsciiLine() + \ . ' Data: ' + \ . s:HexGetAsciiLine() return StatusLine endfunction diff --git a/vimfiles.stefan/plugin/vimsuite.vim b/vimfiles.stefan/plugin/vimsuite.vim index c9ac41d..b40ecbf 100644 --- a/vimfiles.stefan/plugin/vimsuite.vim +++ b/vimfiles.stefan/plugin/vimsuite.vim @@ -69,7 +69,7 @@ function s:GetAllProjectFilesInPath(path) let path = a:path . '*' endif for makefileName in s:projectFileNames - let pathlist = path . ',' . path . '/*,' . path . '/*/*' + let pathlist = path . ',' . path . '/*,' . path . '/*/*,' . path . '/*/*/*' let newfiles = split(globpath(pathlist, makefileName)) let files += newfiles " echo files diff --git a/vimfiles.stefan/spell/bmsk.add b/vimfiles.stefan/spell/bmsk.add index c2b67d3..7f118e0 100644 --- a/vimfiles.stefan/spell/bmsk.add +++ b/vimfiles.stefan/spell/bmsk.add @@ -1595,3 +1595,5 @@ z überarbeitungen überlaufsicher überlaufsichere +baseDir/! +env/! diff --git a/vimfiles.stefan/spell/bmsk.add.spl b/vimfiles.stefan/spell/bmsk.add.spl index 2fb8137..ec56134 100644 Binary files a/vimfiles.stefan/spell/bmsk.add.spl and b/vimfiles.stefan/spell/bmsk.add.spl differ diff --git a/vimfiles.stefan/tools/DirDiff.bat b/vimfiles.stefan/tools/DirDiff.bat index aaf0033..446410a 100644 --- a/vimfiles.stefan/tools/DirDiff.bat +++ b/vimfiles.stefan/tools/DirDiff.bat @@ -1 +1 @@ -c:\tools\vim\vim71\gvim.exe -c "DirDiff %2 %1" +"c:\Program Files\vim\vim73\gvim.exe" -c "DirDiff %2 %1" diff --git a/vimfiles.stefan/vimrc.bmsk b/vimfiles.stefan/vimrc.bmsk index d16448c..bd5625e 100644 --- a/vimfiles.stefan/vimrc.bmsk +++ b/vimfiles.stefan/vimrc.bmsk @@ -1,6 +1,6 @@ let g:Austausch = expand('//easerv.muc/Organisation/ea-41/Austausch') let g:myAustausch = expand(g:Austausch . '/Liebl') -let g:bmskWA = expand('c:/wa') -let g:WA = expand('c:/wa') +let g:bmskWA = expand('d:/wa') +let g:WA = expand('d:/wa') let g:ccm = expand('c:/ec-apps/cmsynergy/ccm64/bin/ccm.exe') diff --git a/vimfiles.stefan/vimrc.dos b/vimfiles.stefan/vimrc.dos index 774cfc8..6a4c8e0 100644 --- a/vimfiles.stefan/vimrc.dos +++ b/vimfiles.stefan/vimrc.dos @@ -5,7 +5,7 @@ let g:backupdir = expand($TEMP . '/vi') let g:swapdir = expand($TEMP . '/vi') let g:gvim = expand($VIMRUNTIME . '/gvim.exe ') -let g:pythonPath = expand('c:/wa/tools/python/2.4.1') +let g:pythonPath = expand('d:/wa/tools/python/2.6.3') let g:diff = expand($VIMRUNTIME . '/diff ') let g:svn = expand('svn ') let g:cvs = expand('cvs ') diff --git a/vimfiles/doc/tags b/vimfiles/doc/tags index 9077c54..404f18a 100644 --- a/vimfiles/doc/tags +++ b/vimfiles/doc/tags @@ -1,3 +1,12 @@ +:CVSEdit vcscommand.txt /*:CVSEdit* +:CVSEditors vcscommand.txt /*:CVSEditors* +:CVSUnedit vcscommand.txt /*:CVSUnedit* +:CVSWatch vcscommand.txt /*:CVSWatch* +:CVSWatchAdd vcscommand.txt /*:CVSWatchAdd* +:CVSWatchOff vcscommand.txt /*:CVSWatchOff* +:CVSWatchOn vcscommand.txt /*:CVSWatchOn* +:CVSWatchRemove vcscommand.txt /*:CVSWatchRemove* +:CVSWatchers vcscommand.txt /*:CVSWatchers* :Explore pi_netrw.txt /*:Explore* :GLVS pi_getscript.txt /*:GLVS* :GetLatestVimScripts_dat pi_getscript.txt /*:GetLatestVimScripts_dat* @@ -51,6 +60,23 @@ :TCommentRight tcomment.txt /*:TCommentRight* :Texplore pi_netrw.txt /*:Texplore* :UseVimball pi_vimball.txt /*:UseVimball* +:VCSAdd vcscommand.txt /*:VCSAdd* +:VCSAnnotate vcscommand.txt /*:VCSAnnotate* +:VCSBlame vcscommand.txt /*:VCSBlame* +:VCSCommit vcscommand.txt /*:VCSCommit* +:VCSDelete vcscommand.txt /*:VCSDelete* +:VCSDiff vcscommand.txt /*:VCSDiff* +:VCSGotoOriginal vcscommand.txt /*:VCSGotoOriginal* +:VCSInfo vcscommand.txt /*:VCSInfo* +:VCSLock vcscommand.txt /*:VCSLock* +:VCSLog vcscommand.txt /*:VCSLog* +:VCSRemove vcscommand.txt /*:VCSRemove* +:VCSRevert vcscommand.txt /*:VCSRevert* +:VCSReview vcscommand.txt /*:VCSReview* +:VCSStatus vcscommand.txt /*:VCSStatus* +:VCSUnlock vcscommand.txt /*:VCSUnlock* +:VCSUpdate vcscommand.txt /*:VCSUpdate* +:VCSVimDiff vcscommand.txt /*:VCSVimDiff* :Vexplore pi_netrw.txt /*:Vexplore* :VimballList pi_vimball.txt /*:VimballList* Align-copyright Align.txt /*Align-copyright* @@ -77,6 +103,26 @@ SRHiGrp SrchRplcHiGrp.txt /*SRHiGrp* SRSearch SrchRplcHiGrp.txt /*SRSearch* SrchRplcHiGrp.txt SrchRplcHiGrp.txt /*SrchRplcHiGrp.txt* TCommentDefineType() tComment.txt /*TCommentDefineType()* +VCSCommandCVSDiffOpt vcscommand.txt /*VCSCommandCVSDiffOpt* +VCSCommandCVSExec vcscommand.txt /*VCSCommandCVSExec* +VCSCommandCommitOnWrite vcscommand.txt /*VCSCommandCommitOnWrite* +VCSCommandDeleteOnHide vcscommand.txt /*VCSCommandDeleteOnHide* +VCSCommandDiffSplit vcscommand.txt /*VCSCommandDiffSplit* +VCSCommandDisableAll vcscommand.txt /*VCSCommandDisableAll* +VCSCommandDisableExtensionMappings vcscommand.txt /*VCSCommandDisableExtensionMappings* +VCSCommandDisableMappings vcscommand.txt /*VCSCommandDisableMappings* +VCSCommandEdit vcscommand.txt /*VCSCommandEdit* +VCSCommandEnableBufferSetup vcscommand.txt /*VCSCommandEnableBufferSetup* +VCSCommandMapPrefix vcscommand.txt /*VCSCommandMapPrefix* +VCSCommandMappings vcscommand.txt /*VCSCommandMappings* +VCSCommandResultBufferNameExtension vcscommand.txt /*VCSCommandResultBufferNameExtension* +VCSCommandResultBufferNameFunction vcscommand.txt /*VCSCommandResultBufferNameFunction* +VCSCommandSVKExec vcscommand.txt /*VCSCommandSVKExec* +VCSCommandSVNDiffExt vcscommand.txt /*VCSCommandSVNDiffExt* +VCSCommandSVNDiffOpt vcscommand.txt /*VCSCommandSVNDiffOpt* +VCSCommandSVNExec vcscommand.txt /*VCSCommandSVNExec* +VCSCommandSplit vcscommand.txt /*VCSCommandSplit* +VCSCommandVCSTypeOverride vcscommand.txt /*VCSCommandVCSTypeOverride* VimPdb.txt VimPdb.txt /*VimPdb.txt* Vimball-copyright pi_vimball.txt /*Vimball-copyright* [% matchit.txt /*[%* @@ -165,6 +211,10 @@ alignmap-tt Align.txt /*alignmap-tt* alignmap-t~ Align.txt /*alignmap-t~* alignmaps Align.txt /*alignmaps* alignusage Align.txt /*alignusage* +b:VCSCommandCommand vcscommand.txt /*b:VCSCommandCommand* +b:VCSCommandOriginalBuffer vcscommand.txt /*b:VCSCommandOriginalBuffer* +b:VCSCommandSourceFile vcscommand.txt /*b:VCSCommandSourceFile* +b:VCSCommandVCSType vcscommand.txt /*b:VCSCommandVCSType* b:match_col matchit.txt /*b:match_col* b:match_debug matchit.txt /*b:match_debug* b:match_ignorecase matchit.txt /*b:match_ignorecase* @@ -1418,6 +1468,7 @@ crvdoc-licGPL crefvimdoc.txt /*crvdoc-licGPL* crvdoc-licLGPL crefvimdoc.txt /*crvdoc-licLGPL* crvdoc-limbugs crefvimdoc.txt /*crvdoc-limbugs* crvdoc-usage crefvimdoc.txt /*crvdoc-usage* +cvscommand-changes vcscommand.txt /*cvscommand-changes* dav pi_netrw.txt /*dav* davs pi_netrw.txt /*davs* drv-dtArrayInit crefvim.txt /*drv-dtArrayInit* @@ -1783,6 +1834,14 @@ op-opAsRightShift crefvim.txt /*op-opAsRightShift* opAsBitAnd crefvim.txt /*opAsBitAnd* opAsBitOr crefvim.txt /*opAsBitOr* opAsBitXor crefvim.txt /*opAsBitXor* +outlook outlook.txt /*outlook* +outlook-configuration outlook.txt /*outlook-configuration* +outlook-install outlook.txt /*outlook-install* +outlook-macro outlook.txt /*outlook-macro* +outlook-new outlook.txt /*outlook-new* +outlook-overview outlook.txt /*outlook-overview* +outlook.txt outlook.txt /*outlook.txt* +outlookvim outlook.txt /*outlookvim* pi_getscript.txt pi_getscript.txt /*pi_getscript.txt* pi_netrw.txt pi_netrw.txt /*pi_netrw.txt* pi_vimball.txt pi_vimball.txt /*pi_vimball.txt* @@ -1814,6 +1873,29 @@ v_]% matchit.txt /*v_]%* v_a% matchit.txt /*v_a%* v_g% matchit.txt /*v_g%* vba pi_vimball.txt /*vba* +vcscommand vcscommand.txt /*vcscommand* +vcscommand-buffer-management vcscommand.txt /*vcscommand-buffer-management* +vcscommand-buffer-variables vcscommand.txt /*vcscommand-buffer-variables* +vcscommand-bugs vcscommand.txt /*vcscommand-bugs* +vcscommand-commands vcscommand.txt /*vcscommand-commands* +vcscommand-config vcscommand.txt /*vcscommand-config* +vcscommand-contents vcscommand.txt /*vcscommand-contents* +vcscommand-customize vcscommand.txt /*vcscommand-customize* +vcscommand-events vcscommand.txt /*vcscommand-events* +vcscommand-install vcscommand.txt /*vcscommand-install* +vcscommand-intro vcscommand.txt /*vcscommand-intro* +vcscommand-manual vcscommand.txt /*vcscommand-manual* +vcscommand-mappings vcscommand.txt /*vcscommand-mappings* +vcscommand-mappings-override vcscommand.txt /*vcscommand-mappings-override* +vcscommand-naming vcscommand.txt /*vcscommand-naming* +vcscommand-options vcscommand.txt /*vcscommand-options* +vcscommand-ssh vcscommand.txt /*vcscommand-ssh* +vcscommand-ssh-config vcscommand.txt /*vcscommand-ssh-config* +vcscommand-ssh-env vcscommand.txt /*vcscommand-ssh-env* +vcscommand-ssh-other vcscommand.txt /*vcscommand-ssh-other* +vcscommand-ssh-wrapper vcscommand.txt /*vcscommand-ssh-wrapper* +vcscommand-statusline vcscommand.txt /*vcscommand-statusline* +vcscommand.txt vcscommand.txt /*vcscommand.txt* vimball pi_vimball.txt /*vimball* vimball-contents pi_vimball.txt /*vimball-contents* vimball-extract pi_vimball.txt /*vimball-extract* @@ -1862,3 +1944,8 @@ visincr-raggedright visincr.txt /*visincr-raggedright* visincr-restrict visincr.txt /*visincr-restrict* visincr-usage visincr.txt /*visincr-usage* visincr.txt visincr.txt /*visincr.txt* +xml-plugin-callbacks xml-plugin.txt /*xml-plugin-callbacks* +xml-plugin-html xml-plugin.txt /*xml-plugin-html* +xml-plugin-mappings xml-plugin.txt /*xml-plugin-mappings* +xml-plugin-settings xml-plugin.txt /*xml-plugin-settings* +xml-plugin.txt xml-plugin.txt /*xml-plugin.txt*