Initialize current window, and clear the readonly flag earlier in file

read process.  This allows code in the autoexec path (i.e. ~/.mg) to
operate on the buffer, making ~/.mg files much more useful.

1 files changed, 12 insertions, 11 deletions

diff --git a/usr.bin/mg/file.c b/usr.bin/mg/file.c
index e1aea606821..0adff5bf369 100644
--- a/usr.bin/mg/file.c
+++ b/usr.bin/mg/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.56 2006/06/01 01:41:49 kjell Exp $	*/
+/*	$OpenBSD: file.c,v 1.57 2006/06/01 05:07:39 kjell Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -209,11 +209,22 @@ readin(char *fname)
 	/* might be old */
 	if (bclear(curbp) != TRUE)
 		return (TRUE);
+	/* Clear readonly. May be set by autoexec path */
+	curbp->b_flag &=~ BFREADONLY;
 	if ((status = insertfile(fname, fname, TRUE)) != TRUE) {
 		ewprintf("File is not readable: %s", fname);
 		return (FALSE);
 	}
 
+	for (wp = wheadp; wp != NULL; wp = wp->w_wndp) {
+		if (wp->w_bufp == curbp) {
+			wp->w_dotp = wp->w_linep = lforw(curbp->b_linep);
+			wp->w_doto = 0;
+			wp->w_markp = NULL;
+			wp->w_marko = 0;
+		}
+	}
+
 	/*
 	 * Call auto-executing function if we need to.
 	 */
@@ -225,14 +236,6 @@ readin(char *fname)
 
 	/* no change */
 	curbp->b_flag &= ~BFCHG;
-	for (wp = wheadp; wp != NULL; wp = wp->w_wndp) {
-		if (wp->w_bufp == curbp) {
-			wp->w_dotp = wp->w_linep = lforw(curbp->b_linep);
-			wp->w_doto = 0;
-			wp->w_markp = NULL;
-			wp->w_marko = 0;
-		}
-	}
 
 	/*
 	 * We need to set the READONLY flag after we insert the file,
@@ -244,8 +247,6 @@ readin(char *fname)
 		ro = TRUE;
 	if (ro == TRUE)
 		curbp->b_flag |= BFREADONLY;
-	else
-		curbp->b_flag &=~ BFREADONLY;
 
 	if (startrow)
 		gotoline(FFARG, startrow);