aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua/vim
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2023-11-18 15:04:14 +0100
committerGitHub <noreply@github.com>2023-11-18 15:04:14 +0100
commitdf87266b23b32b96d1e3d4d26eb721a9dd63c2a4 (patch)
treeef277cb1f5aad32d85313a1044196df640074d32 /runtime/lua/vim
parentcdc8bacc7945da816738e330555fa85d3ffffd56 (diff)
parentc4afb9788c4f139eb2e3b7aa4d6a6a20b67ba156 (diff)
downloadrneovim-df87266b23b32b96d1e3d4d26eb721a9dd63c2a4.tar.gz
rneovim-df87266b23b32b96d1e3d4d26eb721a9dd63c2a4.tar.bz2
rneovim-df87266b23b32b96d1e3d4d26eb721a9dd63c2a4.zip
Merge pull request #25724 from luukvbaal/signmerge
refactor(sign): move legacy signs to extmarks
Diffstat (limited to 'runtime/lua/vim')
-rw-r--r--runtime/lua/vim/_meta/api.lua4
-rw-r--r--runtime/lua/vim/_meta/options.lua6
2 files changed, 2 insertions, 8 deletions
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 0c8979054f..006996ad4e 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -317,8 +317,8 @@ function vim.api.nvim_buf_get_commands(buffer, opts) end
--- @return integer[]
function vim.api.nvim_buf_get_extmark_by_id(buffer, ns_id, id, opts) end
---- Gets `extmarks` in "traversal order" from a `charwise` region defined by
---- buffer positions (inclusive, 0-indexed `api-indexing`).
+--- Gets `extmarks` (including `signs`) in "traversal order" from a `charwise`
+--- region defined by buffer positions (inclusive, 0-indexed `api-indexing`).
--- Region can be given as (row,col) tuples, or valid extmark ids (whose
--- positions define the bounds). 0 and -1 are understood as (0,0) and (-1,-1)
--- respectively, thus the following are equivalent:
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index be4a4dd49c..d2bdab4d28 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -5923,12 +5923,6 @@ vim.go.siso = vim.go.sidescrolloff
--- "number" display signs in the 'number' column. If the number
--- column is not present, then behaves like "auto".
---
---- Note regarding "orphaned signs": with signcolumn numbers higher than
---- 1, deleting lines will also remove the associated signs automatically,
---- in contrast to the default Vim behavior of keeping and grouping them.
---- This is done in order for the signcolumn appearance not appear weird
---- during line deletion.
----
--- @type string
vim.o.signcolumn = "auto"
vim.o.scl = vim.o.signcolumn