Hi, The first patch is a resend to adapt the filectx.cmp monkeypatch in keyword.py to the change in 012b285cf643 - hopefully I got the conditional nesting right this time. The second patch fixes a small typo in the comment on filectx.cmp. c