From f8c66453b5bde4eb70b4326a6d8ff74008e09c5b Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Wed, 7 Jul 2021 12:50:03 +0200 Subject: [vis] don't override vis-editorconfig settings --- config/vis/visrc.lua | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/vis/visrc.lua b/config/vis/visrc.lua index b6c0907..b82de1d 100644 --- a/config/vis/visrc.lua +++ b/config/vis/visrc.lua @@ -26,15 +26,23 @@ vis.events.subscribe(vis.events.INIT, function() vis:command("set theme ".. theme) end) -vis.events.subscribe(vis.events.WIN_OPEN, function(win) - -- Default settings +-- seperate default settings into per file and per window to not override settings from +-- vis-editorconf which are set on FILE_OPEN +-- default file settings +vis.events.subscribe(vis.events.FILE_OPEN, function(file) tabwidth = 4 vis:command('set tabwidth '..tabwidth) vis:command('set autoindent') +end) + +-- load plugins that hook FILE_OPEN to change settings after hook with default settings +require('plugins/vis-editorconfig') + +-- default window settings +vis.events.subscribe(vis.events.WIN_OPEN, function(win) vis:command('set number') vis:command('set colorcolumn 80') vis:command('set show-tabs') - if win.file.name then if win.file.name:find("COMMIT_EDITMSG") then vis:command('set colorcolumn 72') @@ -60,9 +68,6 @@ vis.events.subscribe(vis.events.WIN_OPEN, function(win) end end) --- load plugins that hook WIN_OPEN to change settings after hook with default settings -require('plugins/vis-editorconfig') - vis:map(vis.modes.NORMAL, ";o", function() vis:command('fzf') end) -- cgit v1.2.3