From 535afe3b2a95afe7d9de5f95abc903119156ceee Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Mon, 2 Mar 2009 10:11:45 +0000 Subject: 26614 + 26615: history -t plus ztrftime "-" format modifier --- Doc/Zsh/builtins.yo | 31 +++++++++++++++++++++++-------- Doc/Zsh/calsys.yo | 8 +++++--- Doc/Zsh/prompt.yo | 22 +++++++++++++++++----- 3 files changed, 45 insertions(+), 16 deletions(-) (limited to 'Doc') diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo index d08e3bd90..2ce9aefd1 100644 --- a/Doc/Zsh/builtins.yo +++ b/Doc/Zsh/builtins.yo @@ -484,7 +484,9 @@ Do nothing and return an exit status of 1. findex(fc) cindex(history, editing) cindex(editing history) -xitem(tt(fc) [ tt(-e) var(ename) ] [ tt(-nlrdDfEim) ] [ var(old)tt(=)var(new) ... ] [ var(first) [ var(last) ] ]) +xitem(tt(fc) [ tt(-e) var(ename) ] [ tt(-m) var(match) ] [ var(old)tt(=)var(new) ... ] [ var(first) [ var(last) ] ]) +xitem(tt(fc) tt(-l) [ tt(-nrdfEiD) ] [ tt(-t) var(timefmt) ] [ tt(-m) var(match) ]) +xitem( [ var(old)tt(=)var(new) ... ] [ var(first) [ var(last) ] ]) xitem(tt(fc) tt(-p) [ tt(-a) ] [ var(filename) [ var(histsize) [ var(savehistsize) ] ] ]) xitem(tt(fc) tt(-P)) item(tt(fc) tt(-ARWI) [ var(filename) ])( @@ -517,13 +519,26 @@ or to -1 if the tt(-l) flag is given. The flag tt(-r) reverses the order of the commands and the flag tt(-n) suppresses command numbers when listing. -Also when listing, tt(-d) prints timestamps for each command, and -tt(-f) prints full time-date stamps. Adding the tt(-E) flag -causes the dates to be printed as `var(dd)tt(.)var(mm)tt(.)var(yyyy)', -instead of the default `var(mm)tt(/)var(dd)tt(/)var(yyyy)'. -Adding the tt(-i) flag causes the dates to be printed in ISO8601 -`var(yyyy)tt(-)var(mm)tt(-)var(dd)' format. -With the tt(-D) flag, tt(fc) prints elapsed times. + +Also when listing, +startsitem() +sitem(tt(-d))(prints timestamps for each command) +sitem(tt(-f))(prints full time-date stamps in the US +`var(MM)tt(/)var(DD)tt(/)var(YY) var(hh):var(mm)' format) +sitem(tt(-E))(prints full time-date stamps in the European +`var(dd)tt(.)var(mm)tt(.)var(yyyy) var(hh):var(mm)' format) +sitem(tt(-i))(prints full time-date stamps in ISO8601 +`var(yyyy)tt(-)var(mm)tt(-)var(dd) var(hh):var(mm)' format) +sitem(tt(-t) var(fmt))(prints time and date stamps in the given format; +var(fmt) is formatted with the strftime function with the zsh extensions +described for the tt(%D{)var(string)tt(}) prompt format in +ifzman(the section EXPANSION OF PROMPT SEQUENCES in zmanref(zshmisc))\ +ifnzman(noderef(Prompt Expansion)). The resulting formatted string must be +no more than 256 characters or will not be printed. +) +sitem(tt(-D))(prints elapsed times; may be combined with one of the +options above.) +endsitem() cindex(history, stack) cindex(stack, history) diff --git a/Doc/Zsh/calsys.yo b/Doc/Zsh/calsys.yo index 05a644f2e..68f68a8d2 100644 --- a/Doc/Zsh/calsys.yo +++ b/Doc/Zsh/calsys.yo @@ -613,9 +613,11 @@ The location of the main calendar. The default is tt(~/calendar). kindex(date-format) item(tt(date-format))( A tt(strftime) format string (see manref(strftime)(3)) with the zsh -extensions tt(%f) for a day of the month with no leading zero or space -for single digits, and tt(%k) or tt(%l) for the hour of the day on the 24- -or 12-hour clock, again with no leading zero or space for single digits. +extensions providing various numbers with no leading zero or space +if the number is a single digit as described for the +tt(%D{)var(string)tt(}) prompt format in +ifzman(the section EXPANSION OF PROMPT SEQUENCES in zmanref(zshmisc))\ +ifnzman(noderef(Prompt Expansion)). This is used for outputting dates in tt(calendar), both to support the tt(-v) option and when adding recurring events back to the calendar diff --git a/Doc/Zsh/prompt.yo b/Doc/Zsh/prompt.yo index c30bb0c3c..c11b2553d 100644 --- a/Doc/Zsh/prompt.yo +++ b/Doc/Zsh/prompt.yo @@ -171,11 +171,23 @@ The date in var(mm)tt(/)var(dd)tt(/)var(yy) format. ) item(tt(%D{)var(string)tt(}))( var(string) is formatted using the tt(strftime) function. -See manref(strftime)(3) for more details. Three additional codes are -available: tt(%f) prints the day of the month, like tt(%e) but -without any preceding space if the day is a single digit, and -tt(%K)/tt(%L) correspond to tt(%k)/tt(%l) for the hour of the day -(24/12 hour clock) in the same way. +See manref(strftime)(3) for more details. Various zsh +extensions provide numbers with no leading zero or space +if the number is a single digit: + +startsitem() +sitem(tt(%f))(a day of the month) +sitem(tt(%K))(the hour of the day on the 24-hour clock) +sitem(tt(%L))(the hour of the day on the 12-hour clock) +endsitem() + +The GNU extension that a `tt(-)' between the tt(%) and the +format character causes a leading zero or space to be stripped +is handled directly by the shell for the format characters tt(d), tt(f), +tt(H), tt(k), tt(l), tt(m), tt(M), tt(S) and tt(y); any other format +characters are provided to tt(strftime()) with any leading `tt(-)', +present, so the handling is system dependent. Further GNU +extensions are not supported at present. ) enditem() -- cgit 1.4.1