aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/getchar.c
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-09-17 20:41:47 +0800
committerckelsel <ckelsel@hotmail.com>2017-09-17 20:41:47 +0800
commit6258e33b114dc4386e608a5cf3a48742757441f7 (patch)
tree18521f17269e5f911748194dbdcf48371b4e036e /src/nvim/getchar.c
parentbf80a68d0d0a093c4764b53eb69e43cbb4363af2 (diff)
parent9d6bac3219a0cc1647b560b0d28b0a3fce9dc96a (diff)
downloadrneovim-6258e33b114dc4386e608a5cf3a48742757441f7.tar.gz
rneovim-6258e33b114dc4386e608a5cf3a48742757441f7.tar.bz2
rneovim-6258e33b114dc4386e608a5cf3a48742757441f7.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/getchar.c')
-rw-r--r--src/nvim/getchar.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index a22b716bb6..f5949333bd 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -92,17 +92,15 @@ static int typeahead_char = 0; /* typeahead char that's not flushed */
*/
static int block_redo = FALSE;
-/*
- * Make a hash value for a mapping.
- * "mode" is the lower 4 bits of the State for the mapping.
- * "c1" is the first character of the "lhs".
- * Returns a value between 0 and 255, index in maphash.
- * Put Normal/Visual mode mappings mostly separately from Insert/Cmdline mode.
- */
+// Make a hash value for a mapping.
+// "mode" is the lower 4 bits of the State for the mapping.
+// "c1" is the first character of the "lhs".
+// Returns a value between 0 and 255, index in maphash.
+// Put Normal/Visual mode mappings mostly separately from Insert/Cmdline mode.
#define MAP_HASH(mode, \
c1) (((mode) & \
(NORMAL + VISUAL + SELECTMODE + \
- OP_PENDING)) ? (c1) : ((c1) ^ 0x80))
+ OP_PENDING + TERM_FOCUS)) ? (c1) : ((c1) ^ 0x80))
// Each mapping is put in one of the MAX_MAPHASH hash lists,
// to speed up finding it.