aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/mapping.c
diff options
context:
space:
mode:
authorLewis Russell <lewis6991@gmail.com>2023-03-15 23:30:14 +0000
committerLewis Russell <lewis6991@gmail.com>2023-03-20 10:00:52 +0000
commite1db0e35e4d5859b96e6aff882df62d6c714b569 (patch)
tree8f6356c6a7cf6975c7bf26ad81fb3436ce1f90ae /src/nvim/mapping.c
parent84027f7515b8ee6f818462f105882fc0052783c4 (diff)
downloadrneovim-e1db0e35e4d5859b96e6aff882df62d6c714b569.tar.gz
rneovim-e1db0e35e4d5859b96e6aff882df62d6c714b569.tar.bz2
rneovim-e1db0e35e4d5859b96e6aff882df62d6c714b569.zip
feat(api): add filetype option nvim_get_option_value
- Also adjust the expr-mapping behaviour so normal commands and text changes are allowed in internal dummy buffers.
Diffstat (limited to 'src/nvim/mapping.c')
-rw-r--r--src/nvim/mapping.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/mapping.c b/src/nvim/mapping.c
index 3c4ce0ee2b..5cedc5e97d 100644
--- a/src/nvim/mapping.c
+++ b/src/nvim/mapping.c
@@ -1615,8 +1615,7 @@ char *eval_map_expr(mapblock_T *mp, int c)
// Forbid changing text or using ":normal" to avoid most of the bad side
// effects. Also restore the cursor position.
- textlock++;
- ex_normal_lock++;
+ expr_map_lock++;
set_vim_var_char(c); // set v:char to the typed character
const pos_T save_cursor = curwin->w_cursor;
const int save_msg_col = msg_col;
@@ -1637,8 +1636,7 @@ char *eval_map_expr(mapblock_T *mp, int c)
p = eval_to_string(expr, NULL, false);
xfree(expr);
}
- textlock--;
- ex_normal_lock--;
+ expr_map_lock--;
curwin->w_cursor = save_cursor;
msg_col = save_msg_col;
msg_row = save_msg_row;