aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-02-16 17:32:37 +0800
committerGitHub <noreply@github.com>2022-02-16 17:32:37 +0800
commit0852644bee77f13563d805233c35227b9a00798f (patch)
tree6f5e61d3e3da76a5467e346f54c55d8f536fe375 /src
parent9a74c2b04ac8f54a17925a437b5a2f03b18f6281 (diff)
parent758f1e59990ab515c17667f8a4ee2d3fe44af29f (diff)
downloadrneovim-0852644bee77f13563d805233c35227b9a00798f.tar.gz
rneovim-0852644bee77f13563d805233c35227b9a00798f.tar.bz2
rneovim-0852644bee77f13563d805233c35227b9a00798f.zip
Merge pull request #17424 from zeertzjq/map-followup
follow-up PR to #17423
Diffstat (limited to 'src')
-rw-r--r--src/nvim/api/vim.c2
-rw-r--r--src/nvim/getchar.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index f4909b0801..565015cada 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -1584,7 +1584,7 @@ ArrayOf(Dictionary) nvim_get_keymap(uint64_t channel_id, String mode)
/// @param rhs Right-hand-side |{rhs}| of the mapping.
/// @param opts Optional parameters map. Accepts all |:map-arguments|
/// as keys excluding |<buffer>| but including |noremap| and "desc".
-/// |desc| can be used to give a description to keymap.
+/// "desc" can be used to give a description to keymap.
/// When called from Lua, also accepts a "callback" key that takes
/// a Lua function to call when the mapping is executed.
/// Values are Booleans. Unknown key is an error.
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 470bf56a6e..6978823f2b 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -3583,8 +3583,7 @@ int map_to_exists_mode(const char *const rhs, const int mode, const bool abbr)
mp = maphash[hash];
}
for (; mp; mp = mp->m_next) {
- if ((mp->m_mode & mode)
- && mp->m_str != NULL && strstr((char *)mp->m_str, rhs) != NULL) {
+ if ((mp->m_mode & mode) && strstr((char *)mp->m_str, rhs) != NULL) {
return true;
}
}