diff options
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/hist.c | 22 | ||||
| -rw-r--r-- | Src/lex.c | 2 |
2 files changed, 22 insertions, 2 deletions
diff --git a/Src/hist.c b/Src/hist.c index 1c5d045e7..c77b5dd9d 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -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 */ diff --git a/Src/lex.c b/Src/lex.c index 96da1cbeb..6d45c70c7 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -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) |