Commit: 411f57c1a26b31ff55499efc0dc3dc85af4db6b7 - vim (git)

Commit MetaInfo

• Révision: 411f57c1a26b31ff55499efc0dc3dc85af4db6b7 (tree)
• l'heure: 2023-01-19 23:08:13
• Auteur: badcoff33 <none@none>
• Commiter: badcoff33

Message de Log

minor stuff

Change Summary

• add: after/ftplugin/make.vim
• modified: autoload/run.vim
• modified: colors/apollo.vim
• modified: colors/twotone.vim
• modified: vimrc

Modification

--- /dev/null
+++ b/after/ftplugin/make.vim
@@ -0,0 +1,4 @@
+setlocal noexpandtab " should be default
+setlocal tabstop=4
+setlocal list
+setlocal listchars=tab:<->,lead:.,

--- a/autoload/run.vim
+++ b/autoload/run.vim
@@ -53,14 +53,12 @@ def ConditionalWriteAll(dict: dict<any>)
     if has_key(dict, "nowrite") && (dict.nowrite == 1)
         return
     endif
-    if &autowrite || &autowriteall
-        try
-            silent wall
-        catch /.*/
-            echomsg "No autowrite. Not all modified buffers written"
-        finally
-        endtry
-    endif
+    try
+        silent wall
+    catch /.*/
+        echomsg "No autowrite. Not all modified buffers written"
+    finally
+    endtry
 enddef
 
 export def Run(dict: dict<any>)

--- a/colors/apollo.vim
+++ b/colors/apollo.vim
@@ -1,11 +1,12 @@
-" A Vim color theme
-" Intro: Apollo tries to be a less-is-more color theme. It uses less colors to
-" gain better readability and colorful clutter. But the temptation was too
-" strong: I added some blueish and greenish colors to make thins not too
-" boring. Enjoy!
-" Name: Apollo
-" Maintainer: Markus Prepens
-"
+vim9script
+
+# A Vim color theme
+# Intro: Apollo tries to be a less-is-more color theme. It uses less colors to
+# gain better readability and colorful clutter. But the temptation was too
+# strong: I added some blueish and greenish colors to make thins not too
+# boring. Enjoy!
+# Name: Apollo
+# Maintainer: Markus Prepens
 
 if exists("syntax_on")
    syntax reset
@@ -13,68 +14,71 @@ endif
 
 hi clear
 set background=dark
-let g:colors_name = "apollo"
-
-let s:white   = "#FFFFFF"
-let s:black   = "#000000"
-
-let s:bg1      = "#132443"
-let s:bg2      = "#263154"
-let s:bg3      = "#344468"
-let s:bg4      = "#48506F"
-let s:silver1  = "#A0A0A8"
-let s:silver2  = "#B8B8BE"
-let s:silver3  = "#D0D0D8"
-let s:silver4  = "#E0E0E8"
-let s:green_bg = "#019378"
-let s:green1   = "#02B360"
-let s:green2   = "#07C168"
-let s:green3   = "#07E070"
-let s:green4   = "#07F88F"
-let s:blue_bg  = "#2E4388"
-let s:blue1    = "#3068B0"
-let s:blue2    = "#60A0D8"
-let s:blue3    = "#70B0F8"
-let s:red1     = "#B82042"
-let s:red2     = "#E84070"
-let s:amber    = "#D0CF20"
-
-let s:Fg = {str -> empty(str) ? "" : "guifg=" ..str}
-let s:Bg = {str -> empty(str) ? "" : "guibg="..str}
-let s:Attr = {str -> empty(str) ? "" : "gui="..str}
-let s:Cterm = {str -> empty(str) ? "" : "cterm="..str}
-
-" Basics
-execute "hi Bold" s:Fg(s:silver2)  s:Attr("bold")
-execute "hi Cursor" s:Fg(s:black) s:Bg(s:white)
-execute "hi CursorLine"  s:Bg(s:bg3) s:Cterm("NONE")
-execute "hi CursorLineNr" s:Fg(s:green3) s:Bg(s:bg3) s:Attr("bold")
-execute "hi ErrorMsg" s:Fg(s:red2) s:Bg("bg")
-execute "hi IncSearch" s:Fg(s:black) s:Bg(s:white) s:Attr("bold") s:Cterm("NONE")
-execute "hi Italic" s:Fg(s:silver2)  s:Attr("NONE")
-execute "hi LineNr" s:Fg(s:blue3) s:Bg(s:bg2)
-execute "hi LineNrAbove" s:Fg(s:bg4) s:Bg("bg") s:Attr("bold")
-execute "hi LineNrBelow" s:Fg(s:bg4) s:Bg("bg") s:Attr("bold")
-execute "hi MatchParen" s:Fg(s:green3) s:Bg("bg") s:Attr("underline")
-execute "hi ModeMsg" s:Fg(s:silver2) s:Bg("bg")
-execute "hi NonText" s:Fg(s:blue1) s:Bg(s:bg1)
-execute "hi Normal" s:Fg(s:silver4) s:Bg(s:bg1) s:Attr("NONE")
-execute "hi Pmenu" s:Fg(s:white) s:Bg(s:blue_bg) s:Attr("NONE")
-execute "hi PmenuSbar" s:Fg(s:silver3) s:Bg(s:bg3)
-execute "hi PmenuSel" s:Fg(s:white) s:Bg(s:green_bg) s:Attr("NONE")
-execute "hi PmenuThumb" s:Fg(s:blue2) s:Bg(s:bg4)
-execute "hi Question" s:Fg(s:green2) s:Bg("bg")
-execute "hi QuickFixLine"  s:Fg(s:amber) s:Bg("bg") s:Attr("bold")
-execute "hi Search" s:Fg(s:white) s:Bg(s:blue2) s:Attr("NONE")
-execute "hi StatusLine" s:Fg(s:white) s:Bg(s:blue1) s:Attr("NONE") s:Cterm("NONE")
-execute "hi StatusLineNC" s:Fg(s:silver4) s:Bg(s:bg3) s:Attr("NONE") s:Cterm("NONE")
-execute "hi Terminal" s:Fg(s:green3) s:Bg(s:black)
-execute "hi Title" s:Fg(s:green3)
-execute "hi VertSplit" s:Fg(s:bg2) s:Bg(s:bg2) s:Attr("NONE")
-execute "hi Visual" s:Fg(s:white) s:Bg(s:blue_bg)
-execute "hi WarningMsg" s:Fg(s:blue1) s:Bg("bg")
-execute "hi qfFileName" s:Fg(s:blue2)
-execute "hi qfSeparator" s:Fg("fg")
+
+g:colors_name = "apollo"
+
+var white   = "#FFFFFF"
+var black   = "#000000"
+
+var bg1      = "#132443"
+var bg2      = "#263154"
+var bg3      = "#344468"
+var bg4      = "#48506F"
+var silver1  = "#A0A0A8"
+var silver2  = "#B8B8BE"
+var silver3  = "#D0D0D8"
+var silver4  = "#E0E0E8"
+var green_bg = "#019378"
+var green1   = "#02B360"
+var green2   = "#07C168"
+var green3   = "#07E070"
+var green4   = "#07F88F"
+var blue_bg  = "#2E4388"
+var blue1    = "#3068B0"
+var blue2    = "#60A0D8"
+var blue3    = "#70B0F8"
+var red1     = "#B82042"
+var red2     = "#E84070"
+var amber    = "#D0CF20"
+
+var Fg = (str) => empty(str) ? "" : "guifg=" .. str
+var Bg = (str) => empty(str) ? "" : "guibg=" .. str
+var Attr = (str) => empty(str) ? "" : "gui=" .. str
+var Cterm = (str) => empty(str) ? "" : "cterm=" .. str
+
+# Basics
+execute "hi Bold" Fg(silver2)  Attr("bold")
+execute "hi Cursor" Fg(black) Bg(white)
+execute "hi CursorLine"  Bg(bg3) Cterm("NONE")
+execute "hi CursorLineNr" Fg(green3) Bg(bg3) Attr("bold")
+execute "hi ErrorMsg" Fg(red2) Bg("bg")
+execute "hi IncSearch" Fg(black) Bg(white) Attr("bold") Cterm("NONE")
+execute "hi Italic" Fg(silver2)  Attr("NONE")
+execute "hi LineNr" Fg(blue3) Bg(bg2)
+execute "hi LineNrAbove" Fg(bg4) Bg("bg") Attr("bold")
+execute "hi LineNrBelow" Fg(bg4) Bg("bg") Attr("bold")
+execute "hi MatchParen" Fg(green3) Bg("bg") Attr("underline")
+execute "hi ModeMsg" Fg(silver2) Bg("bg")
+execute "hi NonText" Fg(blue1) Bg(bg1)
+execute "hi Normal" Fg(silver4) Bg(bg1) Attr("NONE")
+execute "hi Pmenu" Fg(white) Bg(blue_bg) Attr("NONE")
+execute "hi PmenuSbar" Fg(silver3) Bg(bg3)
+execute "hi PmenuSel" Fg(white) Bg(green_bg) Attr("NONE")
+execute "hi PmenuThumb" Fg(blue2) Bg(bg4)
+execute "hi Question" Fg(green2) Bg("bg")
+execute "hi QuickFixLine"  Fg(amber) Bg("bg") Attr("bold")
+execute "hi Search" Fg(white) Bg(blue2) Attr("NONE")
+execute "hi StatusLine" Fg(white) Bg(blue1) Attr("NONE") Cterm("NONE")
+execute "hi StatusLineNC" Fg(silver4) Bg(bg3) Attr("NONE") Cterm("NONE")
+execute "hi Terminal" Fg(green3) Bg(black)
+execute "hi Title" Fg(green3)
+execute "hi User1" Fg(white) Bg(green1)
+execute "hi VertSplit" Fg(bg2) Bg(bg2) Attr("NONE")
+execute "hi Visual" Fg(white) Bg(blue_bg)
+execute "hi WarningMsg" Fg(blue1) Bg("bg")
+execute "hi qfFileName" Fg(blue2)
+execute "hi qfSeparator" Fg("fg")
+
 highlight! link CursorColumn CursorLine
 highlight! link FoldColumn Normal
 highlight! link Folded StatusLineNC
@@ -84,63 +88,57 @@ highlight! link StatusLineTermNC StatusLineNC
 highlight! link TabLineSel StatusLine
 highlight! link TabLine StatusLineNC
 highlight! link TabLineFill StatusLineNC
-highlight! link User1 StatusLine
 highlight! link User2 StatusLine
 highlight! link User3 StatusLine
 highlight! link User4 StatusLine
 highlight! link WildMenu IncSearch
 highlight! link qfLineNr    LineNr
-" Code
-execute "hi Statement" s:Fg(s:blue3)
-execute "hi Conditional" s:Fg(s:blue3)  s:Attr("bold")
-execute "hi Type" s:Fg(s:blue2)  s:Attr("NONE")
-execute "hi Structure" s:Fg(s:blue2)
-execute "hi StorageClass" s:Fg(s:blue3)
-execute "hi PreProc" s:Fg(s:white)  s:Attr("bold")
-execute "hi PreCondit" s:Fg(s:blue1)  s:Attr("bold")
-execute "hi Define" s:Fg(s:blue2)  s:Attr("NONE")
-execute "hi Comment" s:Fg(s:green3)
-execute "hi Function" s:Fg(s:blue3) s:Attr("bold")
-execute "hi Identifier" s:Fg(s:silver3)
-execute "hi Special" s:Fg(s:green2)
-execute "hi Constant" s:Fg(s:white)
-execute "hi Number" s:Fg(s:white)
-execute "hi Todo" s:Fg(s:silver2) s:Bg(s:bg3)
-execute "hi Error" s:Fg(s:red2) s:Bg(s:bg3)
-execute "hi Directory" s:Fg(s:silver4)  s:Attr("underline")
-
-" Filetype VIM
-execute "hi vimCommentTitle" s:Fg(s:white)  s:Attr("bold")
-
-" Filetype C
-execute "hi cCppOut" s:Fg(s:silver3)
-execute "hi cCppOutIf2" s:Fg(s:silver3)
-execute "hi cParen" s:Fg(s:silver3)
-execute "hi cBlock" s:Fg(s:silver3)
-
-" filetype HTML
-execute "hi htmlH1" s:Fg(s:green4)  s:Attr("bold")
-execute "hi htmlH2" s:Fg(s:green3)  s:Attr("bold")
-execute "hi htmlH3" s:Fg(s:green2)  s:Attr("bold")
-
-" markdown
-execute "hi markdownCode" s:Fg(s:silver3) s:Bg(s:bg3)
-execute "hi markdownCodeBlock" s:Fg(s:silver2)
-execute "hi markdownUrl" s:Fg(s:silver2) s:Bg(s:bg3) s:Attr("underline")
-execute "hi markdownLinkText" s:Fg(s:blue2)  s:Attr("NONE")
-
-" restructured text
-execute "hi rstEmphasis" s:Fg(s:green2)
-execute "hi rstStrongEmphasis" s:Fg(s:green2)  s:Attr("bold")
-
-" Diffs
-execute "hi DiffChange" s:Fg(s:white) s:Bg(s:bg4)
-execute "hi DiffText" s:Fg(s:blue2) s:Bg(s:bg4) s:Attr("bold")
-execute "hi DiffDelete" s:Fg(s:red1) s:Bg(s:red1)
-execute "hi DiffAdd" s:Fg(s:green2) s:Bg(s:bg3) s:Attr("bold")
-
-" clean up
-unlet s:Fg s:Bg s:Attr s:Cterm
-unlet s:white s:black s:bg1 s:bg2 s:bg3 s:bg4 s:silver1 s:silver2 s:silver3 s:silver4
-unlet s:green_bg s:green1 s:green2 s:green3 s:green4
-unlet s:blue_bg s:blue1 s:blue2 s:blue3 s:red1 s:red2 s:amber
+
+# Code
+execute "hi Statement" Fg(blue3)
+execute "hi Conditional" Fg(blue3)  Attr("bold")
+execute "hi Type" Fg(blue2)  Attr("NONE")
+execute "hi Structure" Fg(blue2)
+execute "hi StorageClass" Fg(blue3)
+execute "hi PreProc" Fg(white)  Attr("bold")
+execute "hi PreCondit" Fg(blue1)  Attr("bold")
+execute "hi Define" Fg(blue2)  Attr("NONE")
+execute "hi Comment" Fg(green3)
+execute "hi Function" Fg(blue3) Attr("bold")
+execute "hi Identifier" Fg(silver3)
+execute "hi Special" Fg(green2)
+execute "hi Constant" Fg(white)
+execute "hi Number" Fg(white)
+execute "hi Todo" Fg(silver2) Bg(bg3)
+execute "hi Error" Fg(red2) Bg(bg3)
+execute "hi Directory" Fg(silver4)  Attr("underline")
+
+# Filetype VIM
+execute "hi vimCommentTitle" Fg(white)  Attr("bold")
+
+# Filetype C
+execute "hi cCppOut" Fg(silver3)
+execute "hi cCppOutIf2" Fg(silver3)
+execute "hi cParen" Fg(silver3)
+execute "hi cBlock" Fg(silver3)
+
+# filetype HTML
+execute "hi htmlH1" Fg(green4)  Attr("bold")
+execute "hi htmlH2" Fg(green3)  Attr("bold")
+execute "hi htmlH3" Fg(green2)  Attr("bold")
+
+# markdown
+execute "hi markdownCode" Fg(silver3) Bg(bg3)
+execute "hi markdownCodeBlock" Fg(silver2)
+execute "hi markdownUrl" Fg(silver2) Bg(bg3) Attr("underline")
+execute "hi markdownLinkText" Fg(blue2)  Attr("NONE")
+
+# restructured text
+execute "hi rstEmphasis" Fg(green2)
+execute "hi rstStrongEmphasis" Fg(green2)  Attr("bold")
+
+# Diffs
+execute "hi DiffChange" Fg(white) Bg(bg4)
+execute "hi DiffText" Fg(blue2) Bg(bg4) Attr("bold")
+execute "hi DiffDelete" Fg(red1) Bg(red1)
+execute "hi DiffAdd" Fg(green2) Bg(bg3) Attr("bold")

--- a/colors/twotone.vim
+++ b/colors/twotone.vim
@@ -82,7 +82,8 @@ execute "hi PreCondit" s:Fg(s:blue)  s:Attr("bold")
 execute "hi PreProc" s:Fg(s:blue) s:Attr("NONE")
 execute "hi Question" s:Fg(s:silver1) s:Bg("bg")
 execute "hi QuickFixLine" s:Fg(s:white) s:Bg(s:red) s:Attr("NONE")
-execute "hi Special" s:Fg(s:silver1)
+execute "hi Special" s:Fg(s:silver2)
+execute "hi SpecialKey" s:Fg(s:silver7)
 execute "hi Statement" s:Fg(s:red)  s:Attr("bold")
 execute "hi StorageClass" s:Fg(s:red)
 execute "hi String" s:Fg(s:silver4)

--- a/vimrc
+++ b/vimrc
@@ -295,24 +295,18 @@ command! -nargs=0 IC :set   ignorecase nosmartcase
 command! -nargs=0 CS :set noignorecase nosmartcase
 command! -nargs=0 SC :set   ignorecase  smartcase
 
-augroup vimrc
+augroup vimrc " {{{
     autocmd!
-    " Reload changed buffers. :checktime relies on 'autoread'.
-    autocmd WinEnter * checktime
-
-    " Choose color theme dependent on term type
+    autocmd WinEnter * checktime " Reload changed buffers. :checktime relies on 'autoread'.
     autocmd VimEnter * execute "colorscheme" ( (&term == "builtin_gui") ? "twotone" : "apollo" )
-
-    " Copy a template as local .vimrc
+    autocmd FocusLost * silent wall
     autocmd BufNewFile .vimrc execute "0read" g:vim_home.."\\templates\\local_vimrc"
-
-augroup END
+augroup END " }}}
 
 let g:term = &term
 syntax on
 
-
-" Vim9: (gvim.exe) since C-] is no longer mapped on German keyboards, use this {{{
+" Vim9: Workaround for gvim.exe since several keys didn't work on German keyboards {{{
 nmap <C-+> g<C-]>
 imap <C-+> <C-]>
 cmap <C-+> <C-]>