2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cd1305a..19d915a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* dfa.c: Sync with GNU grep.
 
+	Unrelated:
+
+	* builtin.c (do_print): Coding style change.
+
 2016-07-03         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* field.c (rebuild_record): Revert warning message regarding flags,
diff --git a/builtin.c b/builtin.c
index 92ac9e49..77cf3fc5 100644
--- a/builtin.c
+++ b/builtin.c
@@ -2203,9 +2203,10 @@ do_print(int nargs, int redirtype)
 
 		if (tmp->type == Node_typedregex)
 			args_array[i] = force_string(tmp);
-		else if (!((tmp->flags & STRCUR) != 0
-				&& (tmp->stfmt == STFMT_UNUSED || tmp->stfmt == OFMTidx)))
-			args_array[i] = format_val(OFMT, OFMTidx, tmp);
+		else if (   (tmp->flags & STRCUR) == 0
+			 || (   tmp->stfmt != STFMT_UNUSED
+			     && tmp->stfmt != OFMTidx))
+				args_array[i] = format_val(OFMT, OFMTidx, tmp);
 	}
 
 	if (redir_exp != NULL) {