From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20575 invoked by alias); 27 Oct 2014 19:56:02 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 33562 Received: (qmail 29472 invoked from network); 27 Oct 2014 19:55:50 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=xBZ/kKNqNBh2YRcqHsSmUFE/79CQkH0qQaDQoCxoWis=; b=xYcAi5ZoYZTdK4wUvaXTd28QDkuuOu5/g5MnbVAv4ijlcX0Z6gaunSMSAZu39BXIkM Xdd/8rE7kTAl5Qa8bilgKqoP7o+uP4fcC93uIeKm8o1IQcMghm8VGk3OBuWMriCpWsEL uARi8+Tl/yS0DYmJ877wZ5GJVthb4ChuHeIKJcBfXHHaRGWjSdljYcMVBJ4TLTFwAuRc T90AvRgbUxBOlGzd+ZFIqumsYyl7B1EpNqQPJICPeOQgkewH/9tlf9cF39IcGA1Sk4aA xW2c9XYq0AgLQmPATFieS2sjmuj3o/ZtOWACBIf6SM1MlLX9Zk2b7LGL4+s9XVjZLhRm sqMA== X-Received: by 10.152.28.134 with SMTP id b6mr26792384lah.12.1414439742292; Mon, 27 Oct 2014 12:55:42 -0700 (PDT) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH: 33562: Fix thinko in previous commit Date: Mon, 27 Oct 2014 20:55:35 +0100 Message-Id: <1414439735-7857-1-git-send-email-mikachu@gmail.com> X-Mailer: git-send-email 2.1.0.GIT In-Reply-To: <1414438362-14778-1-git-send-email-mikachu@gmail.com> References: <1414438362-14778-1-git-send-email-mikachu@gmail.com> Oops. --- ChangeLog | 3 ++- Src/jobs.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56a6ea2..f54327a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2014-10-27 Mikael Magnusson - * 33561: Src/jobs.c: The time builtin forgot to unmetafy TIMEFMT. + * 33561, 33562: Src/jobs.c: The time builtin forgot to unmetafy + TIMEFMT. 2014-10-26 Peter Stephenson diff --git a/Src/jobs.c b/Src/jobs.c index d312b23..494d5aa 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -702,8 +702,10 @@ printtime(struct timeval *real, child_times_t *ti, char *desc) #endif queue_signals(); - if (!(s = unmetafy(getsparam("TIMEFMT"), NULL))) + if (!(s = getsparam("TIMEFMT"))) s = DEFAULT_TIMEFMT; + else + s = unmetafy(s, NULL); for (; *s; s++) if (*s == '%') -- 2.1.0.GIT