From e710660e52a9fc5d91c306379b8c9e618c12e40f Mon Sep 17 00:00:00 2001 From: Stefan Liebl Date: Mon, 5 Sep 2022 09:58:09 +0200 Subject: [PATCH] some fixes for fugitive --- vimfiles.stefan/after/ftplugin/git.vim | 1 + vimfiles.stefan/after/ftplugin/gitcommit.vim | 4 ++-- vimfiles.stefan/plugin/toptica.vim | 11 ++++------- 3 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 vimfiles.stefan/after/ftplugin/git.vim diff --git a/vimfiles.stefan/after/ftplugin/git.vim b/vimfiles.stefan/after/ftplugin/git.vim new file mode 100644 index 0000000..16ffc97 --- /dev/null +++ b/vimfiles.stefan/after/ftplugin/git.vim @@ -0,0 +1 @@ +setlocal foldmethod=syntax diff --git a/vimfiles.stefan/after/ftplugin/gitcommit.vim b/vimfiles.stefan/after/ftplugin/gitcommit.vim index aec3530..e93f347 100644 --- a/vimfiles.stefan/after/ftplugin/gitcommit.vim +++ b/vimfiles.stefan/after/ftplugin/gitcommit.vim @@ -1,6 +1,6 @@ " Stefans gitcommit-filetype-plugin " add branch name to commit message, replace 'feature/DLCPRO-1234-abc' by 'DLCPRO-1234' -nnoremap gcc :execute 'normal i'.substitute(fugitive#head(), '\%(.*/\)*\([^-]\+-\d*\).*', '\1', '')A: -nnoremap ccc :Gcommit:execute 'normal i'.substitute(fugitive#head(), '\%(.*/\)*\([^-]\+-\d*\).*', '\1', '')A: +nnoremap gcc :execute 'normal i'.substitute(FugitiveHead(), '\%(.*/\)*\([^-]\+-\d*\).*', '\1', '')A: +nnoremap ccc :Gcommit:execute 'normal i'.substitute(FugitiveHead(), '\%(.*/\)*\([^-]\+-\d*\).*', '\1', '')A: diff --git a/vimfiles.stefan/plugin/toptica.vim b/vimfiles.stefan/plugin/toptica.vim index b7b1dc1..3b0e3fe 100644 --- a/vimfiles.stefan/plugin/toptica.vim +++ b/vimfiles.stefan/plugin/toptica.vim @@ -73,7 +73,7 @@ function s:ProjectSet(project_type, project_base_dir) let g:ProgramRemote = '/opt/app/bin/device-control' set wildignore-=**/firmware/src/device-control/** set wildignore+=**/shg-firmware/** - let s:makegoals = ['artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] + let s:makegoals = ['artifacts-firmware', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] let s:makeprg = 'make' let g:DeviceIP = 'DLC_PRO__040083' let g:GdbPort = '2345' @@ -93,7 +93,7 @@ function s:ProjectSet(project_type, project_base_dir) let g:ProgramRemote = '/opt/app/bin/user-interface' set wildignore-=**/firmware/src/device-control/** set wildignore+=**/shg-firmware/** - let s:makegoals = ['artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] + let s:makegoals = ['artifacts-firmware', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] let s:makeprg = 'make' let g:DeviceIP = 'DLC_PRO__040083' let g:GdbPort = '2345' @@ -144,7 +144,7 @@ function s:ProjectSet(project_type, project_base_dir) let g:ProgramRemote = '/opt/app/bin/device-control-shg' set wildignore-=**/shg-firmware/** set wildignore+=**/firmware/src/device-control/** - let s:makegoals = ['artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] + let s:makegoals = ['artifacts-firmware', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] let s:makeprg = 'make' let g:DeviceIP = 'DLC_PRO__040083' let g:GdbPort = '6666' @@ -259,9 +259,6 @@ function s:ProjectSet(project_type, project_base_dir) command! DeviceStartGdbServer call s:DeviceStartGdbServer() command! DeviceStartGdbServerAttach call s:DeviceStartGdbServerAttach() - " update device-contol.xml for Topas-GUI - command! DlcproUpdateTopasXml '!svnmucc put -m \'update "device-control.xml"\' ".g:ProjectBuildDir.'/device-control/device-control.xml https://svn.toptica.com/svn/topas_dlc_pro/trunk/res/device-control.xml' - " YouCompleteMe plugin "set completeopt-=preview "let g:ycm_add_preview_to_completeopt = 0 @@ -635,7 +632,7 @@ function s:BuildDirStash(suffix) if a:suffix != '' let suffix = a:suffix else - let suffix = fugitive#head() + let suffix = FugitiveHead() endif let target_dir = g:ProjectBuildDir.'.'.suffix let subsuffix = 1