===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/search.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- src/usr.bin/mg/search.c	2008/06/12 21:58:33	1.36
+++ src/usr.bin/mg/search.c	2009/06/04 02:23:37	1.37
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.c,v 1.36 2008/06/12 21:58:33 kjell Exp $	*/
+/*	$OpenBSD: search.c,v 1.37 2009/06/04 02:23:37 kjell Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -224,7 +224,7 @@
 			curwp->w_dotp = clp;
 			curwp->w_doto = cbo;
 			curwp->w_dotline = cdotline;
-			curwp->w_flag |= WFMOVE;
+			curwp->w_rflag |= WFMOVE;
 			srch_lastdir = dir;
 			(void)ctrlg(FFRAND, 0);
 			(void)strlcpy(pat, opat, sizeof(pat));
@@ -329,7 +329,7 @@
 				/* cursor only moves when isearching forwards */
 				if (dir == SRCH_FORW) {
 					curwp->w_doto = cbo;
-					curwp->w_flag |= WFMOVE;
+					curwp->w_rflag |= WFMOVE;
 					update();
 				}
 			}
@@ -356,7 +356,7 @@
 				curwp->w_marko = cbo;
 				curwp->w_markline = cdotline;
 				ewprintf("Mark set");
-				curwp->w_flag |= WFMOVE;
+				curwp->w_rflag |= WFMOVE;
 				return (TRUE);
 			}
 			/* FALLTHRU */
@@ -419,7 +419,7 @@
 		curwp->w_doto = cmds[cip].s_doto;
 		curwp->w_dotp = cmds[cip].s_dotp;
 		curwp->w_dotline = cmds[cip].s_dotline;
-		curwp->w_flag |= WFMOVE;
+		curwp->w_rflag |= WFMOVE;
 		cmds[cip].s_code = SRCH_NOPR;
 	}
 	if (--cip <= 0)
@@ -614,7 +614,7 @@
 		}
 	}
 stopsearch:
-	curwp->w_flag |= WFFULL;
+	curwp->w_rflag |= WFFULL;
 	update();
 	if (rcnt == 1)
 		ewprintf("Replaced 1 occurrence");
@@ -651,7 +651,7 @@
 		rcnt++;
 	}
 
-	curwp->w_flag |= WFFULL;
+	curwp->w_rflag |= WFFULL;
 	update();
 
 	if (rcnt == 1)
@@ -714,7 +714,7 @@
 			curwp->w_dotp = tlp;
 			curwp->w_doto = tbo;
 			curwp->w_dotline = nline;
-			curwp->w_flag |= WFMOVE;
+			curwp->w_rflag |= WFMOVE;
 			return (TRUE);
 		}
 fail:		;
@@ -777,7 +777,7 @@
 			curwp->w_dotp = tlp;
 			curwp->w_doto = tbo;
 			curwp->w_dotline = nline;
-			curwp->w_flag |= WFMOVE;
+			curwp->w_rflag |= WFMOVE;
 			return (TRUE);
 		}
 fail:		;