mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-26 18:01:03 +02:00
Code Releases Activity

32413: turn off history word marking in cmd subst

Browse source
This commit is contained in:
Peter Stephenson 2015-01-16 20:12:40 +00:00
parent db05cc51fa
commit f2a2f28f7b
3 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-01-16 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 34313: Src/hist.c, Src/lex.c: need to turn off history
word markers when parsing command substitution.
2015-01-16 Peter Stephenson <p.stephenson@samsung.com>
* 34304: Src/lex.c: improve use of new command substitution

22
Src/hist.c
View file

@ -134,6 +134,8 @@ mod_export int hist_skip_flags;
/* Bits of histactive variable */
#define HA_ACTIVE (1<<0) /* History mechanism is active */
#define HA_NOINC (1<<1) /* Don't store, curhist not incremented */
#define HA_INWORD (1<<2) /* We're inside a word, don't add
start and end markers */
/* Array of word beginnings and endings in current history line. */
@ -299,6 +301,22 @@ hist_context_restore(const struct hist_stack *hs, int toplevel)
cmdsp = hs->csp;
}
/*
* Mark that the current level of history is or is not
* within a word, whatever turns up. This is used for nested
* parsing of substitutions.
*/
/**/
void
hist_in_word(int yesno)
{
if (yesno)
histactive |= HA_INWORD;
else
histactive &= ~HA_INWORD;
}
/* restore history context */
/* add a character to the current history word */
@ -1496,7 +1514,7 @@ int hwgetword = -1;
void
ihwbegin(int offset)
{
if (stophist == 2)
if (stophist == 2 || (histactive & HA_INWORD))
return;
if (chwordpos%2)
chwordpos--; /* make sure we're on a word start, not end */
@ -1516,7 +1534,7 @@ ihwbegin(int offset)
void
ihwend(void)
{
if (stophist == 2)
if (stophist == 2 || (histactive & HA_INWORD))
return;
if (chwordpos%2 && chline) {
/* end of word reached and we've already begun a word */

2
Src/lex.c
View file

@ -1922,6 +1922,7 @@ skipcomm(void)
new_lexbuf = lexbuf;
zcontext_save_partial(ZCONTEXT_LEX|ZCONTEXT_PARSE);
hist_in_word(1);
} else {
/*
* Set up for nested command subsitution, however
@ -1992,6 +1993,7 @@ skipcomm(void)
tokstr = new_tokstr;
lexbuf = new_lexbuf;
lexstop = new_lexstop;
hist_in_word(0);
}
if (!lexstop)