diff options
| author | Peter Stephenson <pws@zsh.org> | 2018-01-08 17:25:04 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2018-01-08 17:26:33 +0000 |
| commit | 36fcaeb16799738631d4519e74d2e6398478776d (patch) | |
| tree | 89fbcdf5ab344050e575cc5000ec7df68435e453 | |
| parent | 0f0b602415961aa9ca069c9719a0fbb4bbb9941f (diff) | |
| download | zsh-36fcaeb16799738631d4519e74d2e6398478776d.tar.gz zsh-36fcaeb16799738631d4519e74d2e6398478776d.tar.xz zsh-36fcaeb16799738631d4519e74d2e6398478776d.zip | |
42245: Abort last word on interactve comment.
Last recorded word should be the previous one.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/hist.c | 22 | ||||
| -rw-r--r-- | Src/lex.c | 2 | ||||
| -rw-r--r-- | Src/zsh.h | 1 |
4 files changed, 29 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 72d243d80..ad9bf98e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-01-08 Peter Stephenson <p.stephenson@samsung.com> + + * 42245: Src/hist.c, Src/lex.c, Src/zsh.h: Abort last word on + interactive comment to avoid it becoming a useless word. + 2018-01-05 Oliver Kiddle <okiddle@yahoo.co.uk> * dana: 42231: Completion/Darwin/Command/_caffeinate, diff --git a/Src/hist.c b/Src/hist.c index 177250f31..e08984f00 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -46,6 +46,9 @@ void (*hwaddc) _((int)); void (*hwbegin) _((int)); /**/ +void (*hwabort) _((void)); + +/**/ void (*hwend) _((void)); /**/ @@ -250,6 +253,7 @@ hist_context_save(struct hist_stack *hs, int toplevel) hs->hungetc = hungetc; hs->hwaddc = hwaddc; hs->hwbegin = hwbegin; + hs->hwabort = hwabort; hs->hwend = hwend; hs->addtoline = addtoline; hs->hlinesz = hlinesz; @@ -294,6 +298,7 @@ hist_context_restore(const struct hist_stack *hs, int toplevel) hungetc = hs->hungetc; hwaddc = hs->hwaddc; hwbegin = hs->hwbegin; + hwabort = hs->hwabort; hwend = hs->hwend; addtoline = hs->addtoline; hlinesz = hs->hlinesz; @@ -986,6 +991,11 @@ nohw(UNUSED(int c)) } static void +nohwabort(void) +{ +} + +static void nohwe(void) { } @@ -1057,6 +1067,7 @@ hbegin(int dohist) hungetc = inungetc; hwaddc = nohw; hwbegin = nohw; + hwabort = nohwabort; hwend = nohwe; addtoline = nohw; } else { @@ -1066,6 +1077,7 @@ hbegin(int dohist) hungetc = ihungetc; hwaddc = ihwaddc; hwbegin = ihwbegin; + hwabort = ihwabort; hwend = ihwend; addtoline = iaddtoline; if (!isset(BANGHIST)) @@ -1571,6 +1583,16 @@ ihwbegin(int offset) chwords[chwordpos++] = hptr - chline + offset; } +/* Abort current history word, not needed */ + +/**/ +void +ihwabort(void) +{ + if (chwordpos%2) + chwordpos--; +} + /* add a word to the history List */ /**/ diff --git a/Src/lex.c b/Src/lex.c index c2a59661c..2379804f2 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -677,7 +677,7 @@ gettok(void) (char *)hcalloc(lexbuf.siz = LEX_HEAP_SIZE); add(c); } - hwend(); + hwabort(); while ((c = ingetc()) != '\n' && !lexstop) { hwaddc(c); addtoline(c); diff --git a/Src/zsh.h b/Src/zsh.h index 92f75769a..ba2f8cd9f 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -2992,6 +2992,7 @@ struct hist_stack { void (*hungetc) _((int)); void (*hwaddc) _((int)); void (*hwbegin) _((int)); + void (*hwabort) _((void)); void (*hwend) _((void)); void (*addtoline) _((int)); unsigned char *cstack; |