diff options
author | zeertzjq <zeertzjq@outlook.com> | 2023-08-26 08:35:05 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-26 08:35:05 +0800 |
commit | b1cfb299df2ef412339f594173ed23c75c090c8a (patch) | |
tree | a69da4fdc1e11c05a6dd73c8740ce00dc469c576 /src | |
parent | 5d8ab32f3871b0232972cac1116ac7cba98389e5 (diff) | |
download | rneovim-b1cfb299df2ef412339f594173ed23c75c090c8a.tar.gz rneovim-b1cfb299df2ef412339f594173ed23c75c090c8a.tar.bz2 rneovim-b1cfb299df2ef412339f594173ed23c75c090c8a.zip |
docs: various clarifications (#24876)
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/eval.lua | 18 | ||||
-rw-r--r-- | src/nvim/normal.c | 1 | ||||
-rw-r--r-- | src/nvim/options.lua | 5 | ||||
-rw-r--r-- | src/nvim/plines.c | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua index d5dff3d70d..bb642b97f8 100644 --- a/src/nvim/eval.lua +++ b/src/nvim/eval.lua @@ -11824,15 +11824,15 @@ M.funcs = { The result is a Number representing the type of {expr}. Instead of using the number directly, it is better to use the v:t_ variable that has the value: - Number: 0 (|v:t_number|) - String: 1 (|v:t_string|) - Funcref: 2 (|v:t_func|) - List: 3 (|v:t_list|) - Dictionary: 4 (|v:t_dict|) - Float: 5 (|v:t_float|) - Boolean: 6 (|v:true| and |v:false|) - Null: 7 (|v:null|) - Blob: 10 (|v:t_blob|) + Number: 0 |v:t_number| + String: 1 |v:t_string| + Funcref: 2 |v:t_func| + List: 3 |v:t_list| + Dictionary: 4 |v:t_dict| + Float: 5 |v:t_float| + Boolean: 6 |v:t_bool| (|v:false| and |v:true|) + Null: 7 (|v:null|) + Blob: 10 |v:t_blob| For backward compatibility, this method can be used: >vim if type(myvar) == type(0) | endif if type(myvar) == type("") | endif diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 20680df144..1a220bc962 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -1411,7 +1411,6 @@ static int normal_check(VimState *state) } quit_more = false; - // it's not safe unless normal_check_safe_state() is called state_no_longer_safe(NULL); // If skip redraw is set (for ":" in wait_return()), don't redraw now. diff --git a/src/nvim/options.lua b/src/nvim/options.lua index a565329eac..b774df476f 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -5500,8 +5500,9 @@ return { defaults = { if_true = 'ver:3,hor:6' }, desc = [=[ This option controls the number of lines / columns to scroll by when - scrolling with a mouse. The option is a comma separated list of parts. - Each part consists of a direction and a count as follows: + scrolling with a mouse wheel (|scroll-mouse-wheel|). The option is + a comma-separated list. Each part consists of a direction and a count + as follows: direction:count,direction:count Direction is one of either "hor" or "ver". "hor" controls horizontal scrolling and "ver" controls vertical scrolling. Count sets the amount diff --git a/src/nvim/plines.c b/src/nvim/plines.c index 8ecefc805a..be6bcd22ae 100644 --- a/src/nvim/plines.c +++ b/src/nvim/plines.c @@ -726,7 +726,7 @@ void getvcols(win_T *wp, pos_T *pos1, pos_T *pos2, colnr_T *left, colnr_T *right /// Functions calculating vertical size of text when displayed inside a window. /// Calls horizontal size functions defined above. -/// Check the there may be filler inlines anywhere in window "wp" +/// Check if there may be filler inlines anywhere in window "wp". bool win_may_fill(win_T *wp) { return (wp->w_p_diff && diffopt_filler()) || wp->w_buffer->b_virt_line_blocks; |