diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Functions/Calendar/calendar | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 91ddc5fbd..5bfda7c85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-29 Peter Stephenson <pws@csr.com> + + * unposted: Functions/Calendar/calendar: brief display + failed on single-line entries. + 2009-10-24 Clint Adams <clint@zsh.org> * 27314, 27315: Completion/Unix/Command/_mpc: update for @@ -12276,5 +12281,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4798 $ +* $Revision: 1.4799 $ ***************************************************** diff --git a/Functions/Calendar/calendar b/Functions/Calendar/calendar index c5605fa71..f6316eb18 100644 --- a/Functions/Calendar/calendar +++ b/Functions/Calendar/calendar @@ -7,7 +7,7 @@ integer time start stop today ndays y m d next=-1 shown done nodone integer verbose warntime mywarntime t tcalc tsched i rstat remaining integer showcount icount repeating repeattime resched showall brief local -a calendar_entries calendar_addlines -local -a times calopts showprog lockfiles match mbegin mend +local -a times calopts showprog lockfiles match mbegin mend tmplines local -A reply zmodload -i zsh/datetime || return 1 @@ -298,8 +298,8 @@ fi fi (( shown = 0 )) if (( brief )); then - line=("${(f)line}") - showline=${(F)${${line[1,brief]}}} + tmplines=("${(f)line}") + showline=${(F)${${tmplines[1,brief]}}} else showline=$line fi |