From f3ee62a743fba7c78ac6b4dd2e63d4498f843050 Mon Sep 17 00:00:00 2001 From: bfredl Date: Fri, 24 Jun 2022 13:51:29 +0200 Subject: refactor(map): simplify free_all_mem handling --- src/nvim/memory.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/nvim/memory.c b/src/nvim/memory.c index a615802b36..29a1191bd6 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -15,6 +15,7 @@ #include "nvim/highlight.h" #include "nvim/highlight_group.h" #include "nvim/lua/executor.h" +#include "nvim/mapping.h" #include "nvim/memfile.h" #include "nvim/memory.h" #include "nvim/message.h" @@ -689,11 +690,9 @@ void free_all_mem(void) do_cmdline_cmd("menutranslate clear"); // Clear mappings, abbreviations, breakpoints. - do_cmdline_cmd("lmapclear"); - do_cmdline_cmd("xmapclear"); - do_cmdline_cmd("mapclear"); - do_cmdline_cmd("mapclear!"); - do_cmdline_cmd("abclear"); + // NB: curbuf not used with local=false arg + map_clear_int(curbuf, MAP_ALL_MODES, false, false); + map_clear_int(curbuf, MAP_ALL_MODES, false, true); do_cmdline_cmd("breakdel *"); do_cmdline_cmd("profdel *"); do_cmdline_cmd("set keymap="); -- cgit