From: Mikael Magnusson <mikachu@gmail.com>
To: Bart Schaefer <schaefer@brasslantern.com>
Cc: zsh workers <zsh-workers@zsh.org>
Subject: Re: histlexwords error with >! token
Date: Sun, 25 Jan 2015 21:40:01 +0100 [thread overview]
Message-ID: <CAHYJk3Sygk_EPse997r5Gm_W-mt6Cib3koGFaW_b=PfYcHrTGg@mail.gmail.com> (raw)
In-Reply-To: <150125115905.ZM31435@torch.brasslantern.com>
On Sun, Jan 25, 2015 at 8:59 PM, Bart Schaefer
<schaefer@brasslantern.com> wrote:
> On Jan 25, 7:52pm, Mikael Magnusson wrote:
> } Subject: histlexwords error with >! token
> }
> } Even though the code appears to specially handle it, I still get this error,
> } hist.c:3477: bad(1) wordsplit reading history: echo hello >! /dev/null
> } at: >! /dev/null
> } word: >|
>
> Try this:
>
>
> diff --git a/Src/hist.c b/Src/hist.c
> index 11d9722..87d0723 100644
> --- a/Src/hist.c
> +++ b/Src/hist.c
> @@ -3452,7 +3452,8 @@ histsplitwords(char *lineptr, short **wordsp, int *nwordsp, int *nwordposp,
> if (*lptr == *wptr ||
> (*lptr == '!' && *wptr == '|')) {
> lptr++;
> - wptr++;
> + if (!*++wptr)
> + break;
> } else if (lptr[0] == '\\' &&
> lptr[1] == '\n') {
> /*
That appears to do the trick. I also tried recalling the words with
insert-last-word and copy-earlier-word and they show up as expected
even when they contain spaces, which wasn't the case before the patch.
--
Mikael Magnusson
next prev parent reply other threads:[~2015-01-25 20:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-25 18:52 Mikael Magnusson
2015-01-25 19:59 ` Bart Schaefer
2015-01-25 20:40 ` Mikael Magnusson [this message]
2015-01-25 21:15 ` Bart Schaefer
2015-01-25 21:32 ` Mikael Magnusson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHYJk3Sygk_EPse997r5Gm_W-mt6Cib3koGFaW_b=PfYcHrTGg@mail.gmail.com' \
--to=mikachu@gmail.com \
--cc=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).