--- awkgram.y.errloc	2005-07-26 14:07:43.000000000 -0400
+++ awkgram.y	2006-09-05 14:48:41.162413000 -0400
@@ -1271,7 +1271,6 @@ again:
 		}
 		if (srcfiles[nextfile].val[l-1] == '\n') {
 			/* has terminating newline, can use it directly */
-			sourceline = 1;
 			lexptr = lexptr_begin = srcfiles[nextfile].val;
 			/* fall through to pointer adjustment and return, below */
 		} else {
@@ -1295,6 +1294,8 @@ again:
 			/* set vars and return */
 			lexptr = lexptr_begin = buf;
 		}
+		source = NULL;
+		sourceline = 1;
 		lexend = lexptr + l;
 		nextfile++;	/* for next entry to this routine */
 		return lexptr;