===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/basic.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- src/usr.bin/mg/basic.c	2019/06/17 11:39:26	1.49
+++ src/usr.bin/mg/basic.c	2021/02/27 13:24:52	1.50
@@ -1,4 +1,4 @@
-/*	$OpenBSD: basic.c,v 1.49 2019/06/17 11:39:26 lum Exp $	*/
+/*	$OpenBSD: basic.c,v 1.50 2021/02/27 13:24:52 lum Exp $	*/
 
 /* This file is in the public domain */
 
@@ -54,10 +54,9 @@
 	while (n--) {
 		if (curwp->w_doto == 0) {
 			if ((lp = lback(curwp->w_dotp)) == curbp->b_headp) {
-				if (!(f & FFRAND)) {
-					dobeep();
-					ewprintf("Beginning of buffer");
-				}
+				if (!(f & FFRAND))
+					(void)dobeep_msg("Beginning "
+					    "of buffer");
 				return (FALSE);
 			}
 			curwp->w_dotp = lp;
@@ -101,10 +100,8 @@
 			curwp->w_dotp = lforw(curwp->w_dotp);
 			if (curwp->w_dotp == curbp->b_headp) {
 				curwp->w_dotp = lback(curwp->w_dotp);
-				if (!(f & FFRAND)) {
-					dobeep();
-					ewprintf("End of buffer");
-				}
+				if (!(f & FFRAND))
+					(void)dobeep_msg("End of buffer");
 				return (FALSE);
 			}
 			curwp->w_doto = 0;
@@ -194,10 +191,8 @@
 	if (n < 0)
 		return (backline(f | FFRAND, -n));
 	if ((dlp = curwp->w_dotp) == curbp->b_headp) {
-		if (!(f & FFRAND)) {
-			dobeep();
-			ewprintf("End of buffer");
-		}
+		if (!(f & FFRAND))
+			(void)dobeep_msg("End of buffer");
 		return(TRUE);
 	}
 	if ((lastflag & CFCPCN) == 0)	/* Fix goal. */
@@ -211,10 +206,8 @@
 			curwp->w_dotp = lback(dlp);
 			curwp->w_doto = llength(curwp->w_dotp);
 			curwp->w_rflag |= WFMOVE;
-			if (!(f & FFRAND)) {
-				dobeep();
-				ewprintf("End of buffer");
-			}
+			if (!(f & FFRAND))
+				(void)dobeep_msg("End of buffer");
 			return (TRUE);
 		}
 		curwp->w_dotline++;
@@ -246,20 +239,16 @@
 	thisflag |= CFCPCN;
 	dlp = curwp->w_dotp;
 	if (lback(dlp) == curbp->b_headp)  {
-		if (!(f & FFRAND)) {
-			dobeep();
-			ewprintf("Beginning of buffer");
-		}
+		if (!(f & FFRAND))
+			(void)dobeep_msg("Beginning of buffer");
 		return(TRUE);
 	}
 	while (n-- && lback(dlp) != curbp->b_headp) {
 		dlp = lback(dlp);
 		curwp->w_dotline--;
 	}
-	if (n > 0 && !(f & FFRAND)) {
-		dobeep();
-		ewprintf("Beginning of buffer");
-	}
+	if (n > 0 && !(f & FFRAND))
+		(void)dobeep_msg("Beginning of buffer");
 	curwp->w_dotp = dlp;
 	curwp->w_doto = getgoal(dlp);
 	curwp->w_rflag |= WFMOVE;
@@ -338,11 +327,9 @@
 	lp = curwp->w_linep;
 	while (n--)
 		if ((lp = lforw(lp)) == curbp->b_headp) {
-			dobeep();
-			ewprintf("End of buffer");
+			(void)dobeep_msg("End of buffer");
 			return(TRUE);
 		}
-
 	curwp->w_linep = lp;
 	curwp->w_rflag |= WFFULL;
 
@@ -386,10 +373,9 @@
 	while (n-- && lback(lp) != curbp->b_headp) {
 		lp = lback(lp);
 	}
-	if (lp == curwp->w_linep) {
-		dobeep();
-		ewprintf("Beginning of buffer");
-	}
+	if (lp == curwp->w_linep)
+		(void)dobeep_msg("Beginning of buffer");
+
 	curwp->w_linep = lp;
 	curwp->w_rflag |= WFFULL;
 
@@ -447,11 +433,9 @@
 {
 	struct mgwin *wp;
 
-	if (wheadp->w_wndp == NULL) {
-		dobeep();
-		ewprintf("No other window");
-		return (FALSE);
-	}
+	if (wheadp->w_wndp == NULL)
+		return(dobeep_msg("No other window"));
+
 	wp = curwp;
 	(void) nextwind(f, n);
 	(void) forwpage(f, n);
@@ -514,11 +498,9 @@
 	struct line  *odotp;
 	int odoto, odotline;
 
-	if (curwp->w_markp == NULL) {
-		dobeep();
-		ewprintf("No mark in this window");
-		return (FALSE);
-	}
+	if (curwp->w_markp == NULL)
+		return(dobeep_msg("No mark in this window"));
+
 	odotp = curwp->w_dotp;
 	odoto = curwp->w_doto;
 	odotline = curwp->w_dotline;
@@ -553,11 +535,8 @@
 		if (bufp[0] == '\0')
 			return (ABORT);
 		n = (int)strtonum(buf, INT_MIN, INT_MAX, &err);
-		if (err) {
-			dobeep();
-			ewprintf("Line number %s", err);
-			return (FALSE);
-		}
+		if (err)
+			return(dobeep_msgs("Line number %s", err));
 	}
 	return(setlineno(n));
 }