mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
runtime(termdebug): properly check mapping variables using null_dict
closes: #15013 Signed-off-by: shane.xb.qian <shane.qian@foxmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
parent
79da22de75
commit
a5af73ae34
@ -4,7 +4,7 @@ vim9script
|
|||||||
|
|
||||||
# Author: Bram Moolenaar
|
# Author: Bram Moolenaar
|
||||||
# Copyright: Vim license applies, see ":help license"
|
# Copyright: Vim license applies, see ":help license"
|
||||||
# Last Change: 2024 Jun 14
|
# Last Change: 2024 Jun 16
|
||||||
# Converted to Vim9: Ubaldo Tiberi <ubaldo.tiberi@gmail.com>
|
# Converted to Vim9: Ubaldo Tiberi <ubaldo.tiberi@gmail.com>
|
||||||
|
|
||||||
# WORK IN PROGRESS - The basics works stable, more to come
|
# WORK IN PROGRESS - The basics works stable, more to come
|
||||||
@ -194,9 +194,9 @@ def InitScriptVariables()
|
|||||||
|
|
||||||
winbar_winids = []
|
winbar_winids = []
|
||||||
|
|
||||||
k_map_saved = {}
|
k_map_saved = null_dict
|
||||||
plus_map_saved = {}
|
plus_map_saved = null_dict
|
||||||
minus_map_saved = {}
|
minus_map_saved = null_dict
|
||||||
|
|
||||||
if has('menu')
|
if has('menu')
|
||||||
saved_mousemodel = null_string
|
saved_mousemodel = null_string
|
||||||
@ -1232,32 +1232,38 @@ def DeleteCommands()
|
|||||||
delcommand Var
|
delcommand Var
|
||||||
delcommand Winbar
|
delcommand Winbar
|
||||||
|
|
||||||
if exists('k_map_saved')
|
if k_map_saved isnot null_dict
|
||||||
if !empty(k_map_saved) && !k_map_saved.buffer
|
if !empty(k_map_saved) && k_map_saved.buffer
|
||||||
|
# pass
|
||||||
|
elseif !empty(k_map_saved) && !k_map_saved.buffer
|
||||||
nunmap K
|
nunmap K
|
||||||
mapset(k_map_saved)
|
mapset(k_map_saved)
|
||||||
elseif empty(k_map_saved)
|
elseif empty(k_map_saved)
|
||||||
nunmap K
|
silent! nunmap K
|
||||||
endif
|
endif
|
||||||
k_map_saved = {}
|
k_map_saved = null_dict
|
||||||
endif
|
endif
|
||||||
if exists('plus_map_saved')
|
if plus_map_saved isnot null_dict
|
||||||
if !empty(plus_map_saved) && !plus_map_saved.buffer
|
if !empty(plus_map_saved) && plus_map_saved.buffer
|
||||||
|
# pass
|
||||||
|
elseif !empty(plus_map_saved) && !plus_map_saved.buffer
|
||||||
nunmap +
|
nunmap +
|
||||||
mapset(plus_map_saved)
|
mapset(plus_map_saved)
|
||||||
elseif empty(plus_map_saved)
|
elseif empty(plus_map_saved)
|
||||||
nunmap +
|
silent! nunmap +
|
||||||
endif
|
endif
|
||||||
plus_map_saved = {}
|
plus_map_saved = null_dict
|
||||||
endif
|
endif
|
||||||
if exists('minus_map_saved')
|
if minus_map_saved isnot null_dict
|
||||||
if !empty(minus_map_saved) && !minus_map_saved.buffer
|
if !empty(minus_map_saved) && minus_map_saved.buffer
|
||||||
|
# pass
|
||||||
|
elseif !empty(minus_map_saved) && !minus_map_saved.buffer
|
||||||
nunmap -
|
nunmap -
|
||||||
mapset(minus_map_saved)
|
mapset(minus_map_saved)
|
||||||
elseif empty(minus_map_saved)
|
elseif empty(minus_map_saved)
|
||||||
nunmap -
|
silent! nunmap -
|
||||||
endif
|
endif
|
||||||
minus_map_saved = {}
|
minus_map_saved = null_dict
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if has('menu')
|
if has('menu')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user