Commit: 2e109eb211c8b921c59ff87f02864748b4fca325 - vim (git)

Commit MetaInfo

• Revisión: 2e109eb211c8b921c59ff87f02864748b4fca325 (tree)
• Tiempo: 2023-02-06 21:21:08
• Autor: badcoff33 <none@none>
• Commiter: badcoff33

Log Message

minor changes

Cambiar Resumen

• modified: autoload/run.vim
• modified: colors/twotone.vim
• modified: plugin/rg.vim
• modified: plugin/torchlight.vim
• modified: vimrc

Diferencia incremental

--- a/autoload/run.vim
+++ b/autoload/run.vim
@@ -21,8 +21,9 @@ enddef
 export def CloseCb(ch: channel)
     var ch_nr = split(string(ch), " ")[1]
     var d = g:run_dict[ch_nr]
-    var errors: number
-    var warnings: number
+    var lines = 0
+    var errors = 0
+    var warnings = 0
 
     setwinvar(d.winid, "&wincolor", "PmenuSel")
     g:run_2_tid = timer_start(4000, (_) => {
@@ -41,10 +42,13 @@ export def CloseCb(ch: channel)
         w:quickfix_title = d.cmd
         execute "silent bwipe" d.bufnr
         for e in getqflist({ "nr": "$", "all": 0 }).items
+            lines = lines + 1
             errors += e.type ==? "e" ? 1 : 0
             warnings += e.type ==? "w" ? 1 : 0
         endfor
-        popup_settext(d.winid, "Done: warnings=" .. warnings .. " errros=" .. errors)
+        popup_settext(d.winid, lines .. " lines with "
+                      .. warnings .. " warnings and "
+                      .. errors .. " errors")
     else
         setbufvar(d.bufnr, "&modified", 0)
         setbufvar(d.bufnr, "&modifiable", 0)

--- a/colors/twotone.vim
+++ b/colors/twotone.vim
@@ -105,9 +105,9 @@ execute "hi cParen" s:Fg(s:silver3)
 execute "hi cBlock" s:Fg(s:silver3)
 
 " filetype HTML
-execute "hi htmlH1" s:Fg(s:blue)  s:Attr("bold")
-execute "hi htmlH2" s:Fg(s:blue)  s:Attr("bold")
-execute "hi htmlH3" s:Fg(s:blue)  s:Attr("bold")
+execute "hi htmlH1" s:Fg(s:red)  s:Attr("bold")
+execute "hi htmlH2" s:Fg(s:red)  s:Attr("bold")
+execute "hi htmlH3" s:Fg(s:red)  s:Attr("bold")
 
 " markdown
 execute "hi markdownCode" s:Fg(s:silver3) s:Bg(s:silver9)

--- a/plugin/rg.vim
+++ b/plugin/rg.vim
@@ -32,7 +32,6 @@ def g:RgExcludes(): string
     return exclude_string
 enddef
 
-
 # Using links? Ripgrep supports this by th option '--follow'
 set grepprg=rg\ --vimgrep\ $*
 set grepformat=%f:%l:%c:%m

--- a/plugin/torchlight.vim
+++ b/plugin/torchlight.vim
@@ -5,6 +5,6 @@ augroup GroupTL
     autocmd!
     autocmd TextChanged * torchlight.TorchlightChanged()
     autocmd QuickFixCmdPre make torchlight.TorchlightClearAll()
-    autocmd QuickFixCmdPost make torchlight.TorchlightInCurrentBuf()
+    autocmd QuickFixCmdPost make torchlight.TorchlightUpdate()
 augroup END
 

--- a/vimrc
+++ b/vimrc
@@ -127,7 +127,6 @@ execute "set langmap+=\<Char-214>{"
 
 " Switching modes
 inoremap <k0> <Esc>
-imap jj <Esc>
 imap <Char-252> <Esc>
 
 " Consistent cursor movement
@@ -135,12 +134,14 @@ noremap! <A-Left> <Home>
 noremap! <A-Right> <End>
 nnoremap <A-Left> <Home>
 nnoremap <A-Right> <End>
-xnoremap <A-Left> 0
-xnoremap <A-Right> $
+vnoremap <A-Left> 0
+vnoremap <A-Right> $
 
 " Alternative keys to delete words in insert mode
 inoremap <C-BS> <C-o>db
 inoremap <C-Del> <C-o>de
+cnoremap <C-BS> <C-w>
+cnoremap <C-Del> <C-Right><C-w>
 
 " Next/prev match,expand fold and recenter
 nnoremap n nzzzv