aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/api/extmark.c3
-rw-r--r--src/nvim/buffer_defs.h2
-rw-r--r--src/nvim/eval.lua4
-rw-r--r--src/nvim/mapping.c10
-rw-r--r--src/nvim/ui_defs.h4
5 files changed, 11 insertions, 12 deletions
diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c
index fa74d9a667..5420816726 100644
--- a/src/nvim/api/extmark.c
+++ b/src/nvim/api/extmark.c
@@ -455,8 +455,7 @@ Array nvim_buf_get_extmarks(Buffer buffer, Integer ns_id, Object start, Object e
/// otherwise the same as "trunc".
/// - ephemeral : for use with |nvim_set_decoration_provider()|
/// callbacks. The mark will only be used for the current
-/// redraw cycle, and not be permantently stored in the
-/// buffer.
+/// redraw cycle, and not be permanently stored in the buffer.
/// - right_gravity : boolean that indicates the direction
/// the extmark will be shifted in when new text is inserted
/// (true for right, false for left). Defaults to true.
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 87d548bfab..843eb5aa11 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -916,7 +916,7 @@ typedef enum {
typedef enum {
kWinStyleUnused = 0,
- kWinStyleMinimal, /// Minimal UI: no number column, eob markers, etc
+ kWinStyleMinimal, ///< Minimal UI: no number column, eob markers, etc
} WinStyle;
typedef enum {
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index eb3956d155..d29c96a763 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -7200,7 +7200,7 @@ M.funcs = {
<results in `['two one']`.
]=],
name = 'matchfuzzy',
- params = { { 'list', 'any[]' }, { 'str', 'string' }, { 'dict', 'string' } },
+ params = { { 'list', 'any[]' }, { 'str', 'string' }, { 'dict', 'table' } },
signature = 'matchfuzzy({list}, {str} [, {dict}])',
},
matchfuzzypos = {
@@ -7229,7 +7229,7 @@ M.funcs = {
<results in `[[{"id": 10, "text": "hello"}], [[2, 3]], [127]]`
]=],
name = 'matchfuzzypos',
- params = { { 'list', 'any[]' }, { 'str', 'string' }, { 'dict', 'string' } },
+ params = { { 'list', 'any[]' }, { 'str', 'string' }, { 'dict', 'table' } },
signature = 'matchfuzzypos({list}, {str} [, {dict}])',
},
matchlist = {
diff --git a/src/nvim/mapping.c b/src/nvim/mapping.c
index ca0349d1f6..2b9a972bc9 100644
--- a/src/nvim/mapping.c
+++ b/src/nvim/mapping.c
@@ -104,14 +104,14 @@ struct map_arguments {
char alt_lhs[MAXMAPLEN + 1];
size_t alt_lhs_len;
- char *rhs; /// The {rhs} of the mapping.
+ char *rhs; ///< The {rhs} of the mapping.
size_t rhs_len;
- LuaRef rhs_lua; /// lua function as {rhs}
- bool rhs_is_noop; /// True when the {rhs} should be <Nop>.
+ LuaRef rhs_lua; ///< lua function as {rhs}
+ bool rhs_is_noop; ///< True when the {rhs} should be <Nop>.
- char *orig_rhs; /// The original text of the {rhs}.
+ char *orig_rhs; ///< The original text of the {rhs}.
size_t orig_rhs_len;
- char *desc; /// map description
+ char *desc; ///< map description
};
typedef struct map_arguments MapArguments;
#define MAP_ARGUMENTS_INIT { false, false, false, false, false, false, false, false, \
diff --git a/src/nvim/ui_defs.h b/src/nvim/ui_defs.h
index bbc1655252..b140eee2c5 100644
--- a/src/nvim/ui_defs.h
+++ b/src/nvim/ui_defs.h
@@ -37,8 +37,8 @@ typedef struct {
bool ui_ext[kUIExtCount]; ///< Externalized UI capabilities.
int width;
int height;
- int pum_nlines; /// actual nr. lines shown in PUM
- bool pum_pos; /// UI reports back pum position?
+ int pum_nlines; ///< actual nr. lines shown in PUM
+ bool pum_pos; ///< UI reports back pum position?
double pum_row;
double pum_col;
double pum_height;