CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-08-27 03:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Better fix for #152

Browse source
This commit is contained in:
Kovid Goyal 2017-10-23 11:12:31 +05:30
parent 4f3d71d4ee
commit 70bfe8589f
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kitty/config.py
View file

@ -324,16 +324,18 @@ with open(
defaults = parse_config(f.readlines(), check_keys=False)
Options = namedtuple('Defaults', ','.join(defaults.keys()))
defaults = Options(**defaults)
actions = frozenset(a for a in defaults.keymap.values())
actions = frozenset(a.func for a in defaults.keymap.values()) | frozenset({'combine'})
no_op_actions = frozenset({'noop', 'no-op', 'no_op'})
def merge_keymaps(defaults, newvals):
ans = defaults.copy()
for k, v in newvals.items():
if v in {'noop', 'no-op', 'no_op'}:
f = v.func
if f in no_op_actions:
ans.pop(k, None)
continue
if v in actions:
if f in actions:
ans[k] = v
return ans