diff --git a/docs/features.md b/docs/features.md index dfb4f92a..0431f064 100644 --- a/docs/features.md +++ b/docs/features.md @@ -22,17 +22,13 @@ -## Outline Structure and Undotree +## Outline Structure -## Float Terminal - - +> Warning: The `undotree` feature is not a built-in feature. ## Tabline/Buffers @@ -40,12 +36,6 @@ -## Highlight Words - - - ## CSS Color image diff --git a/docs/user_guide/global_key_mappings.md b/docs/user_guide/global_key_mappings.md index e9a3c8a0..a233f6a5 100644 --- a/docs/user_guide/global_key_mappings.md +++ b/docs/user_guide/global_key_mappings.md @@ -22,7 +22,7 @@ And for the **CMD** keys in mac system, key mappings are avoid as well: - `CMD-Z`: Undo. - ... -> Use `source $VIMRUNTIME/mswin.vim` to enable windows standard keys, `source $VIMRUNTIME/macmap.vim` to enable mac standard keys. +> You can use `source $VIMRUNTIME/mswin.vim` to enable windows standard keys, `source $VIMRUNTIME/macmap.vim` to enable mac standard keys. ## Plugin Commands diff --git a/init.lua b/init.lua index a04b86df..2f562610 100644 --- a/init.lua +++ b/init.lua @@ -6,7 +6,7 @@ local stdpath_config = vim.fn.stdpath("config") local function vimloader(handle) local vimfile = stdpath_config .. string.format("/%s.vim", handle) if uv.fs_stat(vimfile) then - vim.fn.execute(string.format("source %s", vimfile), true) + vim.fn.execute(string.format("source %s", vimfile), "silent!") end end diff --git a/lua/configs/folke/flash-nvim/keys.lua b/lua/configs/folke/flash-nvim/keys.lua index e919007f..cd10205f 100644 --- a/lua/configs/folke/flash-nvim/keys.lua +++ b/lua/configs/folke/flash-nvim/keys.lua @@ -1,11 +1,24 @@ local set_lazy_key = require("builtin.utils.keymap").set_lazy_key +-- Always search in 'ignorecase' mode. local M = { set_lazy_key({ "n", "x", "o" }, "s", function() + local gi = vim.go.ignorecase + local gs = vim.go.smartcase + vim.go.ignorecase = true + vim.go.smartcase = false require("flash").jump() + vim.go.ignorecase = gi + vim.go.smartcase = gs end, { desc = "Jump" }), set_lazy_key({ "o" }, "r", function() + local gi = vim.go.ignorecase + local gs = vim.go.smartcase + vim.go.ignorecase = true + vim.go.smartcase = false require("flash").remote() + vim.go.ignorecase = gi + vim.go.smartcase = gs end, { desc = "Jump in operator-pending" }), } diff --git a/postinit_sample.vim b/postinit_sample.vim index 79ebd51d..07809664 100644 --- a/postinit_sample.vim +++ b/postinit_sample.vim @@ -1 +1,10 @@ " Please copy this file to 'postinit.vim' to enable it. + +" ctrl/cmd-? +if exists("$VIMRUNTIME/mswin.vim") + source $VIMRUNTIME/mswin.vim +end + +if has("mac") && exists("$VIMRUNTIME/macmap.vim") + source $VIMRUNTIME/macmap.vim +end diff --git a/preinit_sample.vim b/preinit_sample.vim index 4118becf..d44121bb 100644 --- a/preinit_sample.vim +++ b/preinit_sample.vim @@ -1,11 +1,5 @@ " Please copy this file to 'preinit.vim' to enable it. -" Enable windows standard keys -" source $VIMRUNTIME/mswin.vim - -" Enable mac standard keys -" source $VIMRUNTIME/macmap.vim - let g:lin_nvim_builtin_constants = { \ 'diagnostic': { \ 'signs': {