From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12756 invoked by alias); 3 Mar 2017 23:55:27 -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: 40716 Received: (qmail 25131 invoked from network); 3 Mar 2017 23:55:27 -0000 X-Qmail-Scanner-Diagnostics: from park01.gkg.net by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(205.235.26.22):SA:0(0.8/5.0):. Processed in 0.638386 secs); 03 Mar 2017 23:55:27 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 X-Envelope-From: SRS0=mdrc=2M=gmail.com=ericdfreese@bounces.park01.gkg.net X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at bounces.park01.gkg.net does not designate permitted sender hosts) X-Virus-Scanned: by amavisd-new at gkg.net Authentication-Results: amavisd4.gkg.net (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=yxcE2gPWK7YbpsvlVlSLVGboEaXqAajshU03H6mmA3E=; b=UWl+xH0QbqyX9Mhcspw0SIZH6BPNdTTMvcgYOVBTF0V3ZvwMyyIBvEHx6ccNnM+jfy 5TnexlCHTONOaVB0dagWmLhOsp5ijRLSSor00MiANZpPTwO6MKFWMNs/QSvtAR6QE5+8 B0rELryKbVdv6pK2xKwF59VrQLV7/9jyyFjOe5tiakPjN29u90+aMhAVHLSd7gsfHxEi wI2Oiy6LJJ7QdLoHoTjo798RGjQ/xWeIthPpjYr7gPT/VjvPRhRSoEyuIB55+ZrHGQY8 +mJkUYHAKh1fMTr6iQvpOAX84jBq/DcliPJcKvz8FxC6d/clfeoOsGoUS3mB3mD8MN1g okMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=yxcE2gPWK7YbpsvlVlSLVGboEaXqAajshU03H6mmA3E=; b=FdQI2vnE1a9966Il0dlcy7adhAFZvuMJUzc1aj26kiGVkzFzMmhbK+PnCYI6W4Ztw/ JrQrO2S0+qnn09KFkwGMqpbZaXPcI9NfaHmm2NRhfi/jEy6RUbMl1X9weNDWc2HwHO5+ BJmDdvcsRcOzirbxmvbwn8NE4/Ut52j6YHwnEsuaQLxIj5l1n6lZGtd6AkArH/lCKqnz latHzvRUr2Y6/UvtdG/qPzDhpazeRR0wupUtESF8Y1nWiP10ynimbZHBmFG/DgPArrgE SEU0nw5LGMqVqlKuzYYacorXkD8KcI8VfIWL4tl84FwrHM/fM1o5pmAzJoKAdkafbF87 Fzbg== X-Gm-Message-State: AMke39m2b/a2hz0D8389slidmSyE90V7HQtxNkUQYMBbAb8v6rPV4Ies6PND7/62Z73Q/+sdD64tR64fAJKxZA== X-Received: by 10.237.38.229 with SMTP id q92mr5493105qtd.6.1488585300077; Fri, 03 Mar 2017 15:55:00 -0800 (PST) MIME-Version: 1.0 From: Eric Freese Date: Fri, 3 Mar 2017 16:54:39 -0700 Message-ID: Subject: Re: [PATCH] Include number of chars in zle unget mechanism in $PENDING calculation To: zsh-workers@zsh.org Content-Type: multipart/alternative; boundary=94eb2c0bb94e077bf90549dc4625 --94eb2c0bb94e077bf90549dc4625 Content-Type: text/plain; charset=UTF-8 This looks great! Pulled it down and it solves my problem. Would love to see this merged. > How about... > > pws > > diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo > index d68365b..b65e3be 100644 > --- a/Doc/Zsh/zle.yo > +++ b/Doc/Zsh/zle.yo > @@ -864,6 +864,12 @@ vindex(KEYS) > item(tt(KEYS) (scalar))( > The keys typed to invoke this widget, as a literal string; read-only. > ) > +vindex(KEYS_QUEUED_COUNT) > +item(tt(KEYS_QUEUED_COUNT) (integer))( > +The number of bytes pushed back to the input queue and therefore > +available for reading immediately before any I/O is done; read-only. > +See also tt(PENDING); the two values are distinct. > +) > vindex(killring) > item(tt(killring) (array))( > The array of previously killed items, with the most recently killed first. > @@ -919,7 +925,8 @@ item(tt(PENDING) (integer))( > The number of bytes pending for input, i.e. the number of bytes which have > already been typed and can immediately be read. On systems where the shell > is not able to get this information, this parameter will always have a > -value of zero. Read-only. > +value of zero. Read-only. See also tt(KEYS_QUEUED_COUNT); the two > +values are distinct. > ) > vindex(PREBUFFER) > item(tt(PREBUFFER) (scalar))( > diff --git a/Src/Zle/zle_params.c b/Src/Zle/zle_params.c > index 1e4c5b8..0a922d2 100644 > --- a/Src/Zle/zle_params.c > +++ b/Src/Zle/zle_params.c > @@ -85,6 +85,8 @@ static const struct gsu_integer cursor_gsu = > { get_cursor, set_cursor, zleunsetfn }; > static const struct gsu_integer histno_gsu = > { get_histno, set_histno, zleunsetfn }; > +static const struct gsu_integer keys_queued_count_gsu = > +{ get_keys_queued_count, NULL, zleunsetfn }; > static const struct gsu_integer mark_gsu = > { get_mark, set_mark, zleunsetfn }; > static const struct gsu_integer numeric_gsu = > @@ -146,6 +148,8 @@ static struct zleparam { > { "HISTNO", PM_INTEGER, GSU(histno_gsu), NULL }, > { "KEYMAP", PM_SCALAR | PM_READONLY, GSU(keymap_gsu), NULL }, > { "KEYS", PM_SCALAR | PM_READONLY, GSU(keys_gsu), NULL }, > + { "KEYS_QUEUED_COUNT", PM_INTEGER | PM_READONLY, GSU(keys_queued_count_gsu), > + NULL}, > { "killring", PM_ARRAY, GSU(killring_gsu), NULL }, > { "LASTABORTEDSEARCH", PM_SCALAR | PM_READONLY, GSU(lastabortedsearch_gsu), > NULL }, > @@ -458,6 +462,13 @@ get_keys(UNUSED(Param pm)) > } > > /**/ > +static zlong > +get_keys_queued_count(UNUSED(Param pm)) > +{ > + return kungetct; > +} > + > +/**/ > static void > set_numeric(UNUSED(Param pm), zlong x) > { --94eb2c0bb94e077bf90549dc4625--