Merge branch 'master' into feature/cmake

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e9c9bda1..25a83a6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-28         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile.c (pprint): Fix copy-paste error in else handling.
+	Thanks to Michal Jaegermann for the report.
+
 2016-02-23         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* config.guess, config.rpath, config.sub: Update to latest
diff --git a/profile.c b/profile.c
index ddc8b9b1..64aeaa9c 100644
--- a/profile.c
+++ b/profile.c
@@ -933,7 +933,7 @@ cleanup:
 			    && pc->branch_end == pc->nexti->nexti->branch_else->lasti) {
 				pprint(pc->nexti, pc->branch_end, IN_ELSE_IF);
 			} else {
-				fprintf(prof_fp, "{\n", op2str(pc->opcode));
+				fprintf(prof_fp, "{\n");
 				indent_in();
 				pprint(pc->nexti, pc->branch_end, NO_PPRINT_FLAGS);
 				indent_out();