diff options
author | Vojtech Vitek (V-Teq) <vvitek@redhat.com> | 2011-01-28 12:46:43 +0100 |
---|---|---|
committer | Vojtech Vitek (V-Teq) <vvitek@redhat.com> | 2011-01-28 13:09:42 +0100 |
commit | 66d60fc038ed784f23eca87bb65ac311e9b8f968 (patch) | |
tree | 90abb5f6e19acdbbcd76eb06e12282da6d4a1c0f /tcsh-6.17.00-dont-print-history-on-verbose.patch | |
parent | 03c261a07b1aae437177a20f4a9c3c7f578ce85e (diff) | |
download | tcsh-rebase-6.19.00-66d60fc038ed784f23eca87bb65ac311e9b8f968.tar.gz tcsh-rebase-6.19.00-66d60fc038ed784f23eca87bb65ac311e9b8f968.tar.xz tcsh-rebase-6.19.00-66d60fc038ed784f23eca87bb65ac311e9b8f968.zip |
- Modify verbose patch to match with upstream (don't print on history -S)
Resolves: #672810
Diffstat (limited to 'tcsh-6.17.00-dont-print-history-on-verbose.patch')
-rw-r--r-- | tcsh-6.17.00-dont-print-history-on-verbose.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tcsh-6.17.00-dont-print-history-on-verbose.patch b/tcsh-6.17.00-dont-print-history-on-verbose.patch new file mode 100644 index 0000000..8e9b42a --- /dev/null +++ b/tcsh-6.17.00-dont-print-history-on-verbose.patch @@ -0,0 +1,23 @@ +diff -u -p -r3.40 -r3.41 +--- tcsh-6.17.00/sh.hist.c 1 Mar 2007 17:14:51 -0000 3.40 ++++ tcsh-6.17.00/sh.hist.c 6 May 2010 14:16:24 -0000 3.41 +@@ -422,8 +422,18 @@ rechist(Char *fname, int ref) + oldidfds = didfds; + didfds = 0; + if ((shist = adrof(STRsavehist)) != NULL && shist->vec != NULL) +- if (shist->vec[1] && eq(shist->vec[1], STRmerge)) ++ if (shist->vec[1] && eq(shist->vec[1], STRmerge)) { ++ /* ++ * Unset verbose while we read the history file. From: ++ * jbastian@redhat.com (Jeffrey Bastian) ++ */ ++ Char *verb = varval(STRverbose); ++ if (verb != STRNULL) ++ unsetv(STRverbose); + loadhist(fname, 1); ++ if (verb != STRNULL) ++ setv(STRverbose, verb, VAR_READWRITE); ++ } + fp = xcreat(short2str(fname), 0600); + if (fp == -1) { + didfds = oldidfds; |