Skip to content

Commit 095181b

Browse files
committed
scrollview_excluded_info_signs -> scrollview_signs_info_excluded
1 parent a313032 commit 095181b

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

autoload/scrollview.vim

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ let g:scrollview_consider_border =
2929
let g:scrollview_current_only = get(g:, 'scrollview_current_only', v:false)
3030
let g:scrollview_excluded_filetypes =
3131
\ get(g:, 'scrollview_excluded_filetypes', [])
32-
let g:scrollview_excluded_info_signs =
33-
\ get(g:, 'scrollview_excluded_info_signs',
34-
\ ['changelist', 'cursor', 'latestchange'])
3532
let g:scrollview_floating_windows =
3633
\ get(g:, 'scrollview_floating_windows', v:false)
3734
let g:scrollview_hide_bar_for_insert =
@@ -97,6 +94,14 @@ endif
9794
" *** General sign settings ***
9895
let g:scrollview_signs_hidden_for_insert =
9996
\ get(g:, 'scrollview_signs_hidden_for_insert', [])
97+
" Use the old option, scrollview_excluded_info_signs, if it's set.
98+
if has_key(g:, 'scrollview_excluded_info_signs')
99+
\ && !has_key(g:, 'scrollview_signs_info_excluded')
100+
let g:scrollview_signs_info_excluded = g:scrollview_excluded_info_signs
101+
endif
102+
let g:scrollview_signs_info_excluded =
103+
\ get(g:, 'scrollview_signs_info_excluded',
104+
\ ['changelist', 'cursor', 'latestchange'])
100105
" The maximum number of signs shown per row. Set to -1 to have no limit.
101106
" Set to 0 to disable signs.
102107
let g:scrollview_signs_max_per_row =

doc/scrollview.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,6 @@ scrollview_excluded_filetypes *scrollview_excluded_filetypes*
240240
which scrollbars should not be displayed. Defaults to
241241
`[]`.
242242

243-
scrollview_excluded_info_signs *scrollview_excluded_info_signs*
244-
|List| of |String|s specifying sign groups to exclude from
245-
visibility consideration when |scrollview_visibility| is
246-
set to `'info'` and there is no overflow. Defaults to
247-
`['changelist', 'cursor', 'latestchange']`.
248-
249243
scrollview_floating_windows *scrollview_floating_windows*
250244
|Boolean| specifying whether scrollbars and signs are
251245
shown in floating windows. Defaults to |v:false|.
@@ -337,7 +331,7 @@ scrollview_visibility |String| specifying the visibility level of scrollbars
337331
* `info` Show scrollbars and signs when content overflows
338332
the window. Otherwise, show when there are signs to
339333
display (excluding those from sign groups included in
340-
|scrollview_excluded_info_signs|).
334+
|scrollview_signs_info_excluded|).
341335

342336
*scrollview_winblend*
343337
scrollview_winblend |Number| specifying the level of transparency for
@@ -382,6 +376,12 @@ scrollview_signs_hidden_for_insert *scrollview_signs_hidden_for_insert*
382376
all sign groups. Defaults to `[]`. See
383377
|scrollview_hide_bar_for_insert| for hiding the scrollbar.
384378

379+
scrollview_signs_info_excluded *scrollview_signs_info_excluded*
380+
|List| of |String|s specifying sign groups to exclude from
381+
visibility consideration when |scrollview_visibility| is
382+
set to `'info'` and there is no overflow. Defaults to
383+
`['changelist', 'cursor', 'latestchange']`.
384+
385385
scrollview_signs_max_per_row *scrollview_signs_max_per_row*
386386
|Number| specifying the maximum number of signs per row.
387387
Set to `-1` to have no limit. Defaults to `-1`.

doc/tags

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ scrollview_diagnostics_warn_priority scrollview.txt /*scrollview_diagnostics_war
7676
scrollview_diagnostics_warn_symbol scrollview.txt /*scrollview_diagnostics_warn_symbol*
7777
scrollview_enabled scrollview.txt /*scrollview_enabled*
7878
scrollview_excluded_filetypes scrollview.txt /*scrollview_excluded_filetypes*
79-
scrollview_excluded_info_signs scrollview.txt /*scrollview_excluded_info_signs*
8079
scrollview_floating_windows scrollview.txt /*scrollview_floating_windows*
8180
scrollview_folds_priority scrollview.txt /*scrollview_folds_priority*
8281
scrollview_folds_symbol scrollview.txt /*scrollview_folds_symbol*
@@ -125,6 +124,7 @@ scrollview_refreshing scrollview.txt /*scrollview_refreshing*
125124
scrollview_search_priority scrollview.txt /*scrollview_search_priority*
126125
scrollview_search_symbol scrollview.txt /*scrollview_search_symbol*
127126
scrollview_signs_hidden_for_insert scrollview.txt /*scrollview_signs_hidden_for_insert*
127+
scrollview_signs_info_excluded scrollview.txt /*scrollview_signs_info_excluded*
128128
scrollview_signs_max_per_row scrollview.txt /*scrollview_signs_max_per_row*
129129
scrollview_signs_on_startup scrollview.txt /*scrollview_signs_on_startup*
130130
scrollview_signs_overflow scrollview.txt /*scrollview_signs_overflow*

lua/scrollview.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2522,7 +2522,7 @@ local refresh_impl = function()
25222522
sign_bufnr, 0, api.nvim_buf_line_count(sign_bufnr), true, {})
25232523
api.nvim_buf_set_option(sign_bufnr, 'modifiable', false)
25242524
end
2525-
local excluded_info_signs = mapify(vim.g.scrollview_excluded_info_signs)
2525+
local excluded_info_signs = mapify(vim.g.scrollview_signs_info_excluded)
25262526
for _, winid in ipairs(target_wins) do
25272527
if should_show(winid) then
25282528
local existing_winid = -1

0 commit comments

Comments
 (0)