diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/zle_hist.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 92e0ed26a..d818348b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-18 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 25690: Src/Zle/zle_hist.c: fix insertlastword not to + screw up characters in the history that needed metafication. + 2008-09-18 Peter Stephenson <pws@csr.com> * 25684: Src/prompt.c: respect trap line number rules in diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c index 85c149929..97b82fdcd 100644 --- a/Src/Zle/zle_hist.c +++ b/Src/Zle/zle_hist.c @@ -599,7 +599,7 @@ insertlastword(char **args) static char *lastinsert; static int lasthist, lastpos, lastlen; - int evhist, save; + int evhist; /* * If we have at least one argument, the first is the history @@ -722,10 +722,9 @@ insertlastword(char **args) t = he->node.nam + he->words[2*n-1]; } - save = *t; - *t = '\0'; /* ignore trailing whitespace */ lasthist = evhist; lastpos = zlemetacs; + /* ignore trailing whitespace */ lastlen = t - s; lastinsert = zalloc(t - s); memcpy(lastinsert, s, lastlen); @@ -734,11 +733,10 @@ insertlastword(char **args) unmetafy_line(); - zs = stringaszleline(s, 0, &len, NULL, NULL); + zs = stringaszleline(dupstrpfx(s, t - s), 0, &len, NULL, NULL); doinsert(zs, len); free(zs); zmult = n; - *t = save; return 0; } |