From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22863 invoked by alias); 3 Nov 2014 16:37:48 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 33596 Received: (qmail 9442 invoked from network); 3 Nov 2014 16:37:46 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1415032237; bh=IpXbrqxNV29s8YbgZ7RYHQjOXpZqI3jdzs5psyoMv/0=; h=In-reply-to:From:References:To:Subject:Date:From:Subject; b=HnMjOF3J8AKwvyDpZldxW05Pa73Op/G0qoZCXwR1I1kappj+U/TA6DxTONXCYwlD0rIGJZmGWWQT7snetHAW0gWoZsBdVoSNUdKptpwYIpyAkaqYdiZ//CBWSyJupToCZxK9Hhf3rL/D8gI0ZYFzK/oBDR8B7wT7JUcq/l1dAhnrJSFZcSRDh9VsYCw0tcYEHiElLC9JEFEZDTNl4zNlx5xo64RaO7+QsH6iK6gubc/gSrNKmtCvFAo+AIrjk2GG5J8l3tcPkYs0wYx7oK+zjpBggGIoEOeN/Z4ADIrOr9erz1G2fOJePMscS3DmzNOhyyiE0lsadci2+3ofE2Gmhg== DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s2048; d=yahoo.co.uk; b=kIToKCNZnekQuRmVb0msJJY6sqdFE1axVYFzuwkQsYKCAUUqAvf+Zfvnq+5HQDUIbow26ewHFTXIa4D58tYNJgFmZyEdi1yhR7zlBLJl7sWFYmQSJBvWtLaG0C74OadbWZHWewURgRusfY0uAYs+oVh/UItN66Q6WtY/9BKJz66k5+RhQURuxzFv6FoqZHC1jqsrnTMfd1H+17gSGssjinFdtB5RxmTlqXZdv7G57fl2rkrNOHjjM9pU2yZ36jbeYn24iVPn3taL+dz93vWt0321V4uEuzqY/ulgaVmwyJPoMCsUM9YdDXLnsX3VBXc+vqdtxy56M+ZQqcluvGWNPg==; X-Yahoo-Newman-Id: 153914.87941.bm@smtp145.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: re.4gMsVM1n5O.kj.d7XtpqLsqyl47nKMPKyvLZyex7iKJa ldTuyYAqBtFykQsKVgYxTU.T38GQd.v5aGojzmwawIsE5U6d6Yo6JmZqhNKX 9XdCBhXk0pcKxHpgFRFkMfhAA2aF1_.4LLAhyR2eQYIj50M.xVeuUO4SY7Tp I1kb3dV_MHtGUw7v0mXuo7UXTZrq1EYGNQ6gXfTywxGtPb7Mj1CTzLE_Vknv 9G8.0b9_sgADbGDk8f288nlk9Z0og.2EsbtBOByxqIQtErL0PokxpqDw2yAY ReH8AfejjysqSsEn6h_MRnW9QLNrxDoFWBVEG20aNJc9Fe_XxzJK.wvd4TBe pNWzVlgc8LrKYJIqPUW2P3Sh2zOpNjDLzXOdyQn02eLArk64SMghNHNTXaSC U2y.3aKUhJ2TWQQ5OOgtPQ3ENmUkXceL8I2nHVgN0WVAWr333LLdyiIfPR19 CEJGGs3iuEp2Tod025ZMbgEauI5DqttjJxqzQ5qOQXUDnyhPieFf35wpJjjU 5E53cEfSL27fu6Bu.G7K5mhRHC1VUQg-- X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI- In-reply-to: From: Oliver Kiddle References: <1050927145304.ZM23258@candle.brasslantern.com> <18653.1415004330@thecus.kiddle.eu> To: Zsh hackers list Subject: Re: PATCH: give precedence to local keymaps (was Re: More on getkeycmd()) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <20534.1415032236.1@thecus.kiddle.eu> Date: Mon, 03 Nov 2014 17:30:36 +0100 Message-ID: <20535.1415032236@thecus.kiddle.eu> Bart wrote: > > I don't particularly object, though of course the ideal behavior would be > that the prefix would be treated as such whenever the two maps overlap. Well, no: I don't want to treat the key as a prefix when the global binding is a prefix of the local binding because then I'm forced to type the local binding faster than $KEYTIMEOUT. I use a fairly short $KEYTIMEOUT having had problems with escape followed by vi commands being interpreted as a key sequence. How about the following patch? This does hiding in the case I mention above but not for the converse: a local binding that is a prefix of a global binding won't hide the longer global binding: you might not want the small $KEYTIMEOUT delay but that's harmless compared to having to type your keys faster than it. Oliver diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c index e21e769..6a71076 100644 --- a/Src/Zle/zle_keymap.c +++ b/Src/Zle/zle_keymap.c @@ -1435,7 +1435,7 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp) loc = ((f = keybind(localkeymap, keybuf, &s)) != t_undefinedkey); ispfx = keyisprefix(localkeymap, keybuf); } - if (!loc) + if (!loc && !ispfx) f = keybind(km, keybuf, &s); ispfx |= keyisprefix(km, keybuf);