Do not expand times and #() inside #().

diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c
index d88a518..f023da5 100644 (file)
--- a/usr.bin/tmux/format.c
+++ b/usr.bin/tmux/format.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.272 2021/02/05 12:23:49 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.273 2021/02/09 14:25:40 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -367,7 +367,10 @@ format_job_get(struct format_expand_state *es, const char *cmd)
                RB_INSERT(format_job_tree, jobs, fj);
        }
 
-       expanded = format_expand1(es, cmd);
+       format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS);
+       next.flags &= ~FORMAT_EXPAND_TIME;
+
+       expanded = format_expand1(&next, cmd);
        if (fj->expanded == NULL || strcmp(expanded, fj->expanded) != 0) {
                free((void *)fj->expanded);
                fj->expanded = xstrdup(expanded);
@@ -393,7 +396,6 @@ format_job_get(struct format_expand_state *es, const char *cmd)
 
        if (ft->flags & FORMAT_STATUS)
                fj->status = 1;
-       format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS);
        return (format_expand1(&next, fj->out));
 }