Merge branch 'master' into wsl-config
This commit is contained in:
commit
4130e78342
5
init.lua
5
init.lua
|
@ -101,11 +101,7 @@ vim.g.have_nerd_font = false
|
||||||
vim.o.number = true
|
vim.o.number = true
|
||||||
-- You can also add relative line numbers, to help with jumping.
|
-- You can also add relative line numbers, to help with jumping.
|
||||||
-- Experiment for yourself to see if you like it!
|
-- Experiment for yourself to see if you like it!
|
||||||
<<<<<<< HEAD
|
|
||||||
vim.opt.relativenumber = true
|
vim.opt.relativenumber = true
|
||||||
=======
|
|
||||||
-- vim.o.relativenumber = true
|
|
||||||
>>>>>>> 3338d3920620861f8313a2745fd5d2be39f39534
|
|
||||||
|
|
||||||
-- Enable mouse mode, can be useful for resizing splits for example!
|
-- Enable mouse mode, can be useful for resizing splits for example!
|
||||||
vim.o.mouse = 'a'
|
vim.o.mouse = 'a'
|
||||||
|
@ -210,6 +206,7 @@ vim.keymap.set('i', '<Esc>', function()
|
||||||
return '<Esc>'
|
return '<Esc>'
|
||||||
end, { expr = true, silent = true })
|
end, { expr = true, silent = true })
|
||||||
|
|
||||||
|
|
||||||
-- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`),
|
-- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`),
|
||||||
-- instead raise a dialog asking if you wish to save the current file(s)
|
-- instead raise a dialog asking if you wish to save the current file(s)
|
||||||
-- See `:help 'confirm'`
|
-- See `:help 'confirm'`
|
||||||
|
|
Loading…
Reference in New Issue