Pull up following revision(s) (requested by jld in ticket #668): netbsd-5
authorsnj <snj@NetBSD.org>
Sat, 04 Apr 2009 23:47:47 +0000
branchnetbsd-5
changeset 258613 3985ada00024
parent 258612 79e607792761
child 258614 7dffef68ac85
Pull up following revision(s) (requested by jld in ticket #668): dist/nvi/vi/v_at.c: revision 1.3 Make vi's '@' command work again; a precedence warning fix in r1.2 added parens in the wrong place such that '@' did nothing. Needs pullup to -5. Reported by Ed Ravin; fixes PR 41134.
dist/nvi/vi/v_at.c
--- a/dist/nvi/vi/v_at.c	Sat Apr 04 23:42:48 2009 +0000
+++ b/dist/nvi/vi/v_at.c	Sat Apr 04 23:47:47 2009 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: v_at.c,v 1.1.1.2.6.1 2009/01/20 02:41:13 snj Exp $ */
+/*	$NetBSD: v_at.c,v 1.1.1.2.6.2 2009/04/04 23:47:47 snj Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -94,9 +94,9 @@
 	for (tp = cbp->textq.cqh_last;
 	    tp != (void *)&cbp->textq; tp = tp->q.cqe_prev) {
 		static CHAR_T nl[] = { '\n', 0 };
-		if ((F_ISSET(cbp, CB_LMODE) ||
-		    ((tp->q.cqe_next != (void *)&cbp->textq) &&
-		    v_event_push(sp, NULL, nl, 1, 0))) ||
+		if (((F_ISSET(cbp, CB_LMODE) ||
+		    tp->q.cqe_next != (void *)&cbp->textq) &&
+		    v_event_push(sp, NULL, nl, 1, 0)) ||
 		    v_event_push(sp, NULL, tp->lb, tp->len, 0))
 			return (1);
 	}