zsh-workers
 help / color / mirror / code / Atom feed
From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH: 33562: Fix thinko in previous commit
Date: Mon, 27 Oct 2014 20:55:35 +0100	[thread overview]
Message-ID: <1414439735-7857-1-git-send-email-mikachu@gmail.com> (raw)
In-Reply-To: <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  <mikachu@gmail.com>
 
-	* 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  <p.w.stephenson@ntlworld.com>
 
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


      reply	other threads:[~2014-10-27 19:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-27 19:32 PATCH: The time builtin forgot to unmetafy TIMEFMT Mikael Magnusson
2014-10-27 19:55 ` Mikael Magnusson [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1414439735-7857-1-git-send-email-mikachu@gmail.com \
    --to=mikachu@gmail.com \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).