diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6a77fdde60..d1a606908a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-20  Joel Brobecker  <brobecker@adacore.com>
+
+	* printcmd.c (print_scalar_formatted): move binary operator from
+	end of line to beginning of next line.  Adjust formatting
+	accordingly.
+
 2016-01-19  John Baldwin  <jhb@FreeBSD.org>
 
 	* fbsd-nat.c (fbsd_pid_to_exec_file): Use new "buflen" instead of
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 8acf441317..f5c4211e5c 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -358,9 +358,9 @@ print_scalar_formatted (const gdb_byte *valaddr, struct type *type,
   /* String printing should go through val_print_scalar_formatted.  */
   gdb_assert (options->format != 's');
 
-  if (len > sizeof(LONGEST) &&
-      (TYPE_CODE (type) == TYPE_CODE_INT
-       || TYPE_CODE (type) == TYPE_CODE_ENUM))
+  if (len > sizeof(LONGEST)
+      && (TYPE_CODE (type) == TYPE_CODE_INT
+	  || TYPE_CODE (type) == TYPE_CODE_ENUM))
     {
       switch (options->format)
 	{