heirloom vi fixes from arch AUR

1 files changed, 4 insertions, 3 deletions

diff --git a/ex_cmds.c b/ex_cmds.c
index c23a1e2..11eb4fa 100644
--- a/ex_cmds.c
+++ b/ex_cmds.c
@@ -128,7 +128,7 @@ commands(int noprompt, int _exitoneof)
 		 * before the next command.
 		 */
 		if (pflag ||
-		    lchng != chng && value(AUTOPRINT) && !inglobal && !inopen && endline) {
+		    (lchng != chng && value(AUTOPRINT) && !inglobal && !inopen && endline)) {
 			pflag = 0;
 			nochng();
 			if (dol != zero) {
@@ -166,7 +166,7 @@ error(catgets(catd, 1, 17,
 			addr1 = addr2;
 			addr = address(0);
 			c = getcd();
-			if (addr == 0)
+			if (addr == 0) {
 				if (c == ',')
 					addr = dot;
 				else if (addr1 != 0) {
@@ -174,6 +174,7 @@ error(catgets(catd, 1, 17,
 					break;
 				} else
 					break;
+			}
 			addr2 = addr;
 			given++;
 			if (c == ';') {
@@ -911,7 +912,7 @@ numberit:
 			setall();
 			if (inglobal == 2)
 				pofix();
-			printf("%d", lineno(addr2));
+			ex_printf("%d", lineno(addr2));
 			noonl();
 			continue;