Commit: f642761f359d146a5fd2f0b34224a2e8f1e34017 - vim (git)

Commit MetaInfo

• Révision: f642761f359d146a5fd2f0b34224a2e8f1e34017 (tree)
• l'heure: 2022-05-09 04:50:24
• Auteur: badcoff33 <none@none>
• Commiter: badcoff33

Message de Log

merged

Change Summary

• modified: after/ftplugin/markdown.vim
• modified: after/ftplugin/qf.vim
• add: after/ftplugin/terminal.vim
• add: autoload/swap.vim
• modified: plugins.vim
• modified: vimrc

Modification

--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -18,10 +18,11 @@ nnoremap <buffer> <LocalLeader>a :if !(&fo =~# 'a') <bar> setlocal fo+=a <bar> e
 nnoremap <buffer> <LocalLeader>x :call <SID>ToggleTodo()<CR>
 
 " Preview in html
-let b:css_file = expand('<sfile>:p:h')..g:path_sep.."markdown\\normalized.css"
-let b:html_template_file = expand('<sfile>:p:h')..g:path_sep.."markdown\\template.html"
+let b:css_file = expand('<sfile>:p:h').."\\markdown\\normalized.css"
 if filereadable(b:css_file)
-  command! -buffer Preview exe "terminal ++close ++hidden"
+  let b:html_template_file = expand('<sfile>:p:h').."\\markdown\\template.html"
+  command! -buffer PreviewHTML terminal ++close ++hidden cmd /C start .preview.html
+  command! -buffer MakeHTML exe "terminal ++close ++hidden"
         \ .." pandoc -f gfm -t html5"
         \ .." --css="..b:css_file
         \ .." --template="..b:html_template_file

--- a/after/ftplugin/qf.vim
+++ b/after/ftplugin/qf.vim
@@ -20,6 +20,3 @@ setlocal nonumber norelativenumber nowrap scrolloff=0
 nnoremap <buffer> <Esc> :cclose<CR>
 nnoremap <buffer> q     :cclose<CR>
 nnoremap <buffer> o     :wincmd o<CR>
-
-nnoremap <buffer> <up> :cprevious<CR>zz<C-w>p
-nnoremap <buffer> <down> :cnext<CR>zz<C-w>p

--- /dev/null
+++ b/after/ftplugin/terminal.vim
@@ -0,0 +1,7 @@
+
+setlocal signcolumn=no
+setlocal nonumber
+setlocal norelativenumber
+setlocal foldcolumn=0
+
+nnoremap <buffer> <LeftMouse> :call feedkeys("i")<CR>

--- /dev/null
+++ b/autoload/swap.vim
@@ -0,0 +1,16 @@
+
+function! swap#OtherFileC()
+  let extension = expand("%:e")
+  let other_file = ""
+  if extension == "c"
+    let other_file = expand("%:r")..".h"
+  elseif extension == "h"
+    let other_file = expand("%:r")..".c"
+  endif
+  if filereadable(other_file)
+    execute "edit" other_file
+  else
+    echo other_file "didn't exist"
+  endif
+endfunction
+

--- a/plugins.vim
+++ b/plugins.vim
@@ -38,8 +38,8 @@ g:dircfg =
          'compiler ghs'
         ],
        'RL78_data_flash': [
-         'command! -nargs=0 CtagsCommand Ctags -R main xcpbasicdrv mcur5f10agf sbcata663431 NvmDriver',
-         'set path=main,xcpbasicdrv,mcur5f10agf,sbcata663431,NvmDriver,NvmDriver/**,,',
+         'command! -nargs=0 CtagsCommand Ctags -R NvmDriverT01 Software',
+         'set path=Software,Software\**,NvmDriverT01,NvmDriverT01/**,,',
          'set grepprg=rg\ --vimgrep\ -g\ *.[ch]\ $*',
          'set relativenumber',
          'compiler iar'

--- a/vimrc
+++ b/vimrc
@@ -122,6 +122,7 @@ command! ShowChanges vert new | set bt=nofile | r ++edit # | 0d_ | diffthis | wi
 inoremap <Ins> <Esc>
 inoremap <k0> <Esc>
 inoremap <C-Space> <Esc>
+inoremap <End> <Esc>
 
 " Yank more consistent to D and dd commands
 nnoremap Y y$
@@ -143,16 +144,16 @@ vnoremap < <gv
 
 " Window movement
 nnoremap <S-Right> <C-w>l
-nnoremap <S-Left> <C-w>h
-nnoremap <S-Up> <C-w>k
-nnoremap <S-Down> <C-w>j
+nnoremap <S-Left>  <C-w>h
+nnoremap <S-Up>    <C-w>k
+nnoremap <S-Down>  <C-w>j
 tnoremap <S-Right> <C-\><C-n><C-w>l
 tnoremap <S-Left>  <C-\><C-n><C-w>h
 tnoremap <S-Up>    <C-\><C-n><C-w>k
 tnoremap <S-Down>  <C-\><C-n><C-w>j
 
 " To map <Esc> to exit terminal-mode: >
-tnoremap <Esc> <C-\><C-n>
+tnoremap <Esc>       <C-\><C-n>
 tnoremap <LeftMouse> <C-\><C-n>
 
 " Line bubbling
@@ -174,8 +175,8 @@ cnoreabbrev <expr> make  (getcmdtype() ==# ':' && getcmdline() =~# '^make')  ? '
 imap <C-CR> <C-]>
 cmap <C-CR> <C-]>
 
-nnoremap <C-Down> :cnext<CR>
-nnoremap <C-Up> :cprevious<CR>
+nnoremap <F12> :cnext<CR>
+nnoremap <F11> :cprevious<CR>
 nnoremap <C-j> :cnext<CR>
 nnoremap <C-k> :cprevious<CR>
 nnoremap n nzzzv
@@ -260,4 +261,5 @@ let g:term = &term
 syntax on
 
 runtime plugins.vim
+
 " vim:sw=2:tw=78:nocindent:foldmethod=marker:nofen: