Commit: 2d96c2325e75eff3521f074abc41c68741331740 - vim (git)

Commit MetaInfo

• Révision: 2d96c2325e75eff3521f074abc41c68741331740 (tree)
• l'heure: 2022-03-22 15:20:10
• Auteur: badcoff33 <none@none>
• Commiter: badcoff33

Message de Log

update

Change Summary

• modified: autoload/lib/popup.vim
• modified: autoload/run.vim
• modified: colors/twotone.vim
• modified: gvimrc
• modified: plugin/run.vim
• modified: vimrc

Modification

--- a/autoload/lib/popup.vim
+++ b/autoload/lib/popup.vim
@@ -1,19 +1,27 @@
+function! lib#popup#top_right(text)
+  return popup_create(a:text, #{
+        \ pos: "topright",
+        \ line: 1,
+        \ col: &columns,
+        \ time: 2500,
+        \ tabpage: -1,
+        \ highlight: 'PmenuSel',
+        \ padding: [1,1,1,1],
+        \ maxwidth: (&columns * 2) / 3
+        \ })
+endfunction
+
 function! lib#popup#bottom_right(text)
-  if type(a:text) == v:t_list
-    let w = 0
-    for e in a:text
-      let w = max([w, e])
-    endfor
-    return popup_create(a:text, #{
-          \ pos: "botright",
-          \ line: &lines - 2,
-          \ col: &columns,
-          \ time: 2500,
-          \ tabpage: -1,
-          \ highlight: 'PmenuSel',
-          \ padding: [1,1,1,1]
-          \ })
-  endif
+  return popup_create(a:text, #{
+        \ pos: "botright",
+        \ line: &lines - 2,
+        \ col: &columns,
+        \ time: 2500,
+        \ tabpage: -1,
+        \ highlight: 'PmenuSel',
+        \ padding: [1,1,1,1],
+        \ maxwidth: (&columns * 2) / 3
+        \ })
 endfunction
 
 function! lib#popup#bottom_left(text)

--- a/autoload/run.vim
+++ b/autoload/run.vim
@@ -17,7 +17,7 @@ function! run#close(ch)
   let dict_name = GetJobDictName(a:ch)
   execute 'call setqflist([], "r", ' dict_name ')'
   let text = "job done: "..eval(dict_name..'["title"]')
-  let winid = lib#popup#bottom_left(text)
+  let winid = lib#popup#top_right(text)
   call setwinvar(winid, "&wrap", 0)
 endfunction
 

--- a/colors/twotone.vim
+++ b/colors/twotone.vim
@@ -45,7 +45,7 @@ execute 'hi StatusLineNC' s:GuiFg(s:silver2) s:GuiBg(s:silver7) s:GuiAttr('NONE'
 execute 'hi VertSplit' s:GuiFg(s:silver9) s:GuiBg(s:silver9) s:GuiAttr('NONE')
 execute 'hi IncSearch' s:GuiFg(s:white) s:GuiBg(s:black) s:GuiAttr('none')
 execute 'hi Search' s:GuiFg(s:black) s:GuiBg(s:silver8) s:GuiAttr('NONE')
-execute 'hi MatchParen' s:GuiFg(s:silver1) s:GuiBg(s:silver9) s:GuiAttr('underline')
+execute 'hi MatchParen' s:GuiFg(s:blue) s:GuiBg('bg') s:GuiAttr('bold')
 execute 'hi QuickFixLine' s:GuiFg(s:red) s:GuiBg(s:white) s:GuiAttr('bold,italic')
 execute 'hi CursorLine' s:GuiBg(s:silver9)
 execute 'hi CursorLineNr' s:GuiFg(s:silver1) s:GuiBg(s:silver7) s:GuiAttr('bold')

--- a/gvimrc
+++ b/gvimrc
@@ -5,7 +5,7 @@ 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=JetBrains_Mono:h10 linespace=2
+set guifont=Courier_Prime:h11 linespace=2
 set guioptions=!a
 set guicursor+=a:blinkon0
 set renderoptions=

--- a/plugin/run.vim
+++ b/plugin/run.vim
@@ -5,5 +5,5 @@ command! -complete=file -nargs=* Make call run#run({'cmd':'make <args>', 'hidden
 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> <cmd>:Make -s<up><cr>
+nnoremap <f7> :<C-u>Make -s<up><cr>
 imap <f7> <Esc><f7>,

--- a/vimrc
+++ b/vimrc
@@ -185,8 +185,9 @@ inoremap <C-Space>} <C-o>db{<C-r>-}
 let g:vim_home = expand('<sfile>:p:h')
 let g:path_sep = has('unix') ? '/' : '\'
 
-""" make use of german keys
-set langmap=ü/,Ü?,ö],Ö[,ä},Ä{
+""" make use of Umlaut keys
+"set langmap=ü/,Ü?,ö],Ö[,ä},Ä{
+set langmap=Ö\",ö:
 
 " set leader and localleader keys, that works best for me
 let mapleader = " "
@@ -197,7 +198,7 @@ let LsFilter = { ft -> has_key(g:ft2regex, ft) ? g:ft2regex[ft] : ''}
 nnoremap <expr> <Leader>b ':filter /'..LsFilter(&ft)..'/ ls<CR>'
 
 """ quick note taking
-nnoremap <expr> <Leader>n ":edit "..strftime("~/Documents/Notes/note-%d-%m-%y.txt".."<CR>:setfiletype markdown<CR>")
+nnoremap <expr> <Leader>n ":drop "..strftime("~/Documents/Notes/note-%d-%m-%y.txt".."<CR>:setfiletype markdown<CR>")
 
 """ toggle options
 nnoremap <Leader>oh :set invhlsearch hlsearch?<CR>
@@ -219,6 +220,12 @@ nnoremap <Leader>Q :cclose<CR>
 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
+
 command! -nargs=0 IC :set   ignorecase nosmartcase
 command! -nargs=0 CS :set noignorecase nosmartcase
 command! -nargs=0 SC :set   ignorecase  smartcase