summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2007-12-31 23:14:17 +0000
committerBart Schaefer <barts@users.sourceforge.net>2007-12-31 23:14:17 +0000
commit15e8fe245d62798b4e21059b101231982532546b (patch)
tree8b6cf400264ad0891e1bbbc1da10603c0cea2d84
parent66742c60451a1741688245d682471611f33372a5 (diff)
downloadzsh-15e8fe245d62798b4e21059b101231982532546b.tar.gz
zsh-15e8fe245d62798b4e21059b101231982532546b.zip
24324: do not set ftim when re-entering the history mechanism for string
substitution.
-rw-r--r--ChangeLog3
-rw-r--r--Src/hist.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4313a3862..975acea87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
run-help-$1 to provide specific help for the command, before
falling back on "man".
+ * 24324: Src/hist.c: do not set ftim when re-entering the history
+ mechanism for string substitution.
+
2007-12-31 Clint Adams <clint@zsh.org>
* 24330: Completion/X/_xpdf: add some missing options from xpdf
diff --git a/Src/hist.c b/Src/hist.c
index d4f3fc454..05fc6e003 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -826,7 +826,7 @@ hbegin(int dohist)
}
chwordpos = 0;
- if (hist_ring && !hist_ring->ftim)
+ if (hist_ring && !hist_ring->ftim && !strin)
hist_ring->ftim = time(NULL);
if ((dohist == 2 || (interact && isset(SHINSTDIN))) && !strin) {
histactive = HA_ACTIVE;