Commit: 4fd77a6a14f6f5d006403084b91898ce6c20384a - vim (git)

Commit MetaInfo

• Révision: 4fd77a6a14f6f5d006403084b91898ce6c20384a (tree)
• l'heure: 2022-03-30 14:17:59
• Auteur: badcoff33 <none@none>
• Commiter: badcoff33

Message de Log

update

Change Summary

• modified: after/ftplugin/c.vim
• modified: after/ftplugin/markdown.vim
• modified: after/ftplugin/rst.vim
• modified: after/ftplugin/txt.vim
• modified: autoload/lib/popup.vim
• modified: autoload/run.vim
• modified: gvimrc
• modified: plugin/run.vim
• modified: plugin/visuals.vim
• modified: plugins.vim
• modified: vimrc

Modification

--- a/after/ftplugin/c.vim
+++ b/after/ftplugin/c.vim
@@ -7,14 +7,14 @@ let g:c_show_list_chars = get(g:, 'c_show_list_chars', 1)
 
 " iabbrev did not work when 'cpoptions' has '>'
 if match(&cpoptions, '>') < 0
-iabbrev <buffer> xswitch switch ()<Left><C-f>
-iabbrev <buffer> xcase   case :<C-f><CR>break;<CR><Up><Up><End><Left>
-iabbrev <buffer> xop     {<C-f><CR><CR>}<CR><Up><Up><C-f>
-iabbrev <buffer> xif     if ()<Left><C-f>
-iabbrev <buffer> xelse   else<C-f><CR>{<C-f><CR><CR>}<CR><Up><Up><C-f>
-iabbrev <buffer> xinc    #include ".h"<Left><Left><Left>
-iabbrev <buffer> xdef    #define
-iabbrev <buffer> xdbg    #warning DEBUG CODE:
+iabbrev <buffer> _switch switch ()<Left><C-f>
+iabbrev <buffer> _case   case :<C-f><CR>break;<CR><Up><Up><End><Left>
+iabbrev <buffer> _op     {<C-f><CR><CR>}<CR><Up><Up><C-f>
+iabbrev <buffer> _if     if ()<Left><C-f>
+iabbrev <buffer> _else   else<C-f><CR>{<C-f><CR><CR>}<CR><Up><Up><C-f>
+iabbrev <buffer> _inc    #include ".h"<Left><Left><Left>
+iabbrev <buffer> _def    #define
+iabbrev <buffer> _dbg    #warning DEBUG CODE:
 endif
 
 " quick preview of tags

--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -56,9 +56,9 @@ if match(&cpoptions, '>') >= 0
   finish
 endif
 
-iabbrev <buffer> xlink []()<Esc>2hi
-iabbrev <buffer> xdate <C-r>=strftime("%Y-%m-%d")<CR>
-iabbrev <buffer> xpy   ``` python<CR><CR>```<Up>
+iabbrev <buffer> _link []()<Esc>2hi
+iabbrev <buffer> _date <C-r>=strftime("%Y-%m-%d")<CR>
+iabbrev <buffer> _py   ``` python<CR><CR>```<Up>
 
 function! s:ToggleTodo()
   let stop_at_line = search('^\s*$','nbW')

--- a/after/ftplugin/rst.vim
+++ b/after/ftplugin/rst.vim
@@ -18,7 +18,7 @@ nnoremap <buffer> <LocalLeader>h4 0v$beyo<Esc>PVr^}
 nnoremap <buffer> <LocalLeader>x :call gtd#ToggleTodo()<CR>
 
 " be up to date
-iabbrev <buffer> xdate <C-r>=strftime("%Y-%m-%d")<CR>
-iabbrev <buffer> xtodo *TODO*
-iabbrev <buffer> xlink `NAME <>`_<Esc>2bea
+iabbrev <buffer> _date <C-r>=strftime("%Y-%m-%d")<CR>
+iabbrev <buffer> _todo *TODO*
+iabbrev <buffer> _link `NAME <>`_<Esc>2bea
 

--- a/after/ftplugin/txt.vim
+++ b/after/ftplugin/txt.vim
@@ -9,6 +9,6 @@ setlocal formatoptions-=atc
 nnoremap <buffer> <LocalLeader>x :call gtd#ToggleTodo()<CR>
 
 " be up to date
-iabbrev <buffer> xdate <C-r>=strftime("%Y-%m-%d")<CR>
-iabbrev <buffer> xtodo *TODO*
+iabbrev <buffer> _date <C-r>=strftime("%Y-%m-%d")<CR>
+iabbrev <buffer> _todo *TODO*
 

--- a/autoload/lib/popup.vim
+++ b/autoload/lib/popup.vim
@@ -1,3 +1,16 @@
+function! lib#popup#top_left(text)
+  return popup_create(a:text, #{
+        \ pos: "topleft",
+        \ line: 1,
+        \ col: 1,
+        \ time: 2500,
+        \ tabpage: -1,
+        \ highlight: 'PmenuSel',
+        \ padding: [1,1,1,1],
+        \ maxwidth: (&columns * 2) / 3
+        \ })
+endfunction
+
 function! lib#popup#top_right(text)
   return popup_create(a:text, #{
         \ pos: "topright",

--- a/autoload/run.vim
+++ b/autoload/run.vim
@@ -16,8 +16,11 @@ function! run#close(ch)
   unlet g:run_ani_winid
   let dict_name = GetJobDictName(a:ch)
   execute 'call setqflist([], "r", ' dict_name ')'
+  if !empty(getqflist())
+    clast
+  endif
   let text = "job done: "..eval(dict_name..'["title"]')
-  let winid = lib#popup#top_right(text)
+  let winid = lib#popup#top_left(text)
   call setwinvar(winid, "&wrap", 0)
 endfunction
 
@@ -59,10 +62,10 @@ function! run#run(dict)
     let d=#{title: a:dict["cmd"], lines: [], efm: regexp}
     execute "let "..GetJobDictName(j).."= copy(d)"
     if ( job_status(j) == "run" ) && !exists("g:run_ani_winid") && ( !exists('a:dict.hidden') || (a:dict.hidden == 0) )
-      let g:run_tid = timer_start(500, function("run#alive"), #{repeat: -1})
+      let g:run_tid = timer_start(200, function("run#alive"), #{repeat: -1})
       let g:run_ani_index = 0
       let g:run_ani_winid = popup_create(s:run_ani_string[0], #{
-            \ line: &lines - 1,
+            \ line: 1,
             \ col: 1,
             \ tabpage: -1,
             \ highlight: 'PmenuSel',

--- a/gvimrc
+++ b/gvimrc
@@ -5,14 +5,15 @@ nnoremap <expr> <leader>h11 ':set guifont='..FontFamily()..':h11<CR>'
 nnoremap <expr> <leader>h10 ':set guifont='..FontFamily()..':h10<CR>'
 nnoremap <expr> <leader>h9  ':set guifont='..FontFamily()..':h9<CR>'
 
-set guifont=Courier_Prime:h11 linespace=2
+"set guifont=JetBrains_Mono
+set guifont=Courier_Prime:h11
 set guioptions=!a
 set guicursor+=a:blinkon0
 set renderoptions=
 set mousemodel=popup
 set nomousefocus
 set signcolumn=yes
-set columns=120
+set columns=100
 
 tnoremap <LeftMouse> <C-w>N
 tmap <RightMouse> <C-w>N<RightMouse>

--- a/plugin/run.vim
+++ b/plugin/run.vim
@@ -4,6 +4,5 @@ command! -complete=file -nargs=* Ctags call run#run({'cmd':'ctags <args>','hidde
 command! -complete=file -nargs=* Make call run#run({'cmd':'make <args>', 'hidden':0})
 command! -complete=file -nargs=* Rg call run#run({'cmd':'rg --vimgrep <args>', 'hidden':0, 'regexp':&grepformat})
 
-nnoremap <leader><f7> :<C-u>Make -s<space>
-nnoremap <f7> :<C-u>Make -s<up><cr>
-imap <f7> <Esc><f7>,
+nnoremap <leader>M :<C-u>Make -s<space>
+nnoremap <leader>m :<C-u>Make -s<up><cr>

--- a/plugin/visuals.vim
+++ b/plugin/visuals.vim
@@ -1,11 +1,15 @@
 " Vim plugin file
 
-command! -nargs=0 HlWord call visuals#hl_word_on()
-noremap <Leader><Leader> <cmd>HlWord<CR>
-autocmd BufEnter * call visuals#blend_down()
-
 command -nargs=0 InfoHl call visuals#info_hl()
-
+command -nargs=0 HlWord call visuals#hl_word_on()
 command -nargs=0 BlinkyOn :call visuals#enable_blinky()
 command -nargs=0 BlinkyOff :call visuals#disable_blinky()
+
+augroup visuals
+  au!
+  autocmd WinNew * call visuals#blend_down()
+augroup END
+
+noremap <Leader><Leader> <cmd>HlWord<CR>
+
 BlinkyOn " default to ON

--- a/plugins.vim
+++ b/plugins.vim
@@ -23,9 +23,9 @@ let g:dircfg =
       \   'compiler ghs'
       \  ],
       \ 'RL78_data_flash': [
-      \   'command! -nargs=0 CtagsCommand Ctags -R main xcpbasicdrv mcur5f10agf sbcata663431 FDL_EEL_RL78_Type01/FDL/lib',
+      \   'command! -nargs=0 CtagsCommand Ctags -R main xcpbasicdrv mcur5f10agf sbcata663431 NvmDriver',
       \   'nnoremap <C-CR> :<C-u>Rg -tc -tcmake <C-r><C-w> .',
-      \   'set path=main,xcpbasicdrv,mcur5f10agf,sbcata663431,FDL_EEL_RL78_Type01/FDL/lib,NvmDriver,,',
+      \   'set path=main,xcpbasicdrv,mcur5f10agf,sbcata663431,NvmDriver,NvmDriver/**,,',
       \   'set grepprg=rg\ --vimgrep\ -g\ *.[ch]\ $*',
       \   'set relativenumber',
       \   'compiler iar'

--- a/vimrc
+++ b/vimrc
@@ -116,10 +116,12 @@ set diffopt=internal,algorithm:minimal,context:8,vertical,iwhite,filler
 if &diff
   set columns=999 lines=999
 endif
+command! DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis | wincmd p | diffthis
 
 " Switch to normal mode with special keys
 inoremap <Ins> <Esc>
 inoremap <k0> <Esc>
+inoremap <C-Space> <Esc>
 
 " Yank more consistent to D and dd commands
 nnoremap Y y$
@@ -141,10 +143,6 @@ nnoremap <S-Right> <C-w>l
 nnoremap <S-Left> <C-w>h
 nnoremap <S-Up> <C-w>k
 nnoremap <S-Down> <C-w>j
-imap     <S-Right> <Esc><S-Right>
-imap     <S-Left> <Esc><S-Left>
-imap     <S-Up> <Esc><S-Up>
-imap     <S-Down> <Esc><S-Down>
 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
@@ -159,12 +157,17 @@ nnoremap <A-k> <cmd>move .-2<CR>==
 vnoremap <A-j> :move '>+1<CR>==gv=gv
 vnoremap <A-k> :move '<-2<CR>==gv=gv
 
-nnoremap <A-+> 3<C-w>+3<C-w>>
-nnoremap <A--> 3<C-w>-3<C-w><
-
 nnoremap <A-o> :bprevious<CR>
 nnoremap <A-i> :bnext<CR>
 
+" command line
+cnoremap <expr> <A-.> expand("%:h")..g:path_sep
+cnoremap <expr> <A-,> $USERPROFILE..g:path_sep..'vimfiles'..g:path_sep
+
+" Expand abbreviations (without trailing space)
+imap <C-CR> <C-]>
+cmap <C-CR> <C-]>
+
 nnoremap <C-j> :cnext<CR>
 nnoremap <C-k> :cprevious<CR>
 nnoremap n nzzzv
@@ -176,27 +179,22 @@ nmap <C-l> :nohlsearch<cr>:diffupdate<cr>:redraw!<cr>
 imap <C-l> <Esc><C-l>
 
 " Type a word, press below key squence and "Enclose" `current` (word) {bang}!
-inoremap <C-Space>" <C-o>db"<C-r>-"
-inoremap <C-Space>' <C-o>db'<C-r>-'
-inoremap <C-Space>` <C-o>db`<C-r>-`
-inoremap <C-Space>) <C-o>db(<C-r>-)
-inoremap <C-Space>] <C-o>db[<C-r>-]
-inoremap <C-Space>} <C-o>db{<C-r>-}
+inoremap <A-Space>" <C-o>db"<C-r>-"
+inoremap <A-Space>' <C-o>db'<C-r>-'
+inoremap <A-Space>` <C-o>db`<C-r>-`
+inoremap <A-Space>) <C-o>db(<C-r>-)
+inoremap <A-Space>] <C-o>db[<C-r>-]
+inoremap <A-Space>} <C-o>db{<C-r>-}
 
 let g:vim_home = expand('<sfile>:p:h')
 let g:path_sep = has('unix') ? '/' : '\'
 
 """ make use of Umlaut keys
-"set langmap=ü/,Ü?,ö],Ö[,ä},Ä{
-set langmap=Ö\",ö:
+set langmap=Ö\",ö:,ü{,ä},Ü[,Ä]
 
 " set leader and localleader keys, that works best for me
 let mapleader = " "
-let maplocalleader = "+"
-
-let g:ft2regex = { 'c':'\.[ch]$', 'vim':'vim', 'py':'\.py$', 'cmake':'\(\.cmake\|CMakeLists.txt\)' }
-let LsFilter = { ft -> has_key(g:ft2regex, ft) ? g:ft2regex[ft] : ''}
-nnoremap <expr> <Leader>b ':filter /'..LsFilter(&ft)..'/ ls<CR>'
+let maplocalleader = "-"
 
 """ quick note taking
 nnoremap <expr> <Leader>n ":drop "..strftime("~/Documents/Notes/note-%d-%m-%y.txt".."<CR>:setfiletype markdown<CR>")
@@ -214,18 +212,18 @@ vnoremap <Leader>r :s///gI<Left><Left><Left><Left>
 
 """ quickfix
 nnoremap <Leader>c :clist!<CR>
-nnoremap <Leader>q :botright copen<CR>
+nnoremap <Leader>q :botright copen<CR>G
 nnoremap <Leader>Q :cclose<CR>
 
-""" command line
-cnoremap <expr> <A-.> expand("%:h")..g:path_sep
-cnoremap <expr> <A-,> $USERPROFILE..g:path_sep..'vimfiles'..g:path_sep
-
 """ command line abbreviations
-cabbrev E edit
-cabbrev T tabedit
-cabbrev F find
-cabbrev J tjump
+cabbrev e edit
+cabbrev t tabedit
+cabbrev f find
+cabbrev j tjump
+cabbrev b buffer
+let g:ft2regex = { 'c':'\.[ch]$', 'vim':'vim', 'py':'\.py$', 'cmake':'\(\.cmake\|CMakeLists.txt\)' }
+let LsFilter = { ft -> has_key(g:ft2regex, ft) ? g:ft2regex[ft] : ''}
+cabbrev <expr> B 'filter /'..LsFilter(&ft)..'/ ls<CR>'
 
 command! -nargs=0 IC :set   ignorecase nosmartcase
 command! -nargs=0 CS :set noignorecase nosmartcase