upstream changes

CVS/Entries

@@ -35,7 +35,6 @@
 /window.c/1.37/Thu Apr  6 02:42:33 2023//
 /word.c/1.21/Thu Apr  6 02:42:33 2023//
 /yank.c/1.16/Thu Apr  6 02:42:33 2023//
-/main.c/1.95/Result of merge//
 /basic.c/1.54/Mon May  1 15:14:05 2023//
 /buffer.c/1.114/Mon May  1 15:14:05 2023//
 /cmode.c/1.22/Mon May  1 15:14:05 2023//
@@ -49,6 +48,7 @@
 /modes.c/1.22/Mon May  1 15:14:06 2023//
 /paragraph.c/1.49/Mon May  1 15:14:06 2023//
 /util.c/1.50/Mon May  1 15:14:06 2023//
-/mg.1/1.135/Fri Jul 21 10:22:53 2023//
 /fileio.c/1.112/Result of merge+Wed Aug 16 17:46:58 2023//
+/mg.1/1.136/Tue Oct 17 23:05:45 2023//
+/main.c/1.96/Result of merge//
 D

main.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.95 2023/04/14 15:34:08 tb Exp $	*/
+/*	$OpenBSD: main.c,v 1.96 2023/10/24 10:26:02 op Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -179,8 +179,10 @@ main(int argc, char **argv)
 		ffclose(ffp, NULL);
 	}
 
-	if (batch)
+	if (batch) {
+		vttidy();
 		return (0);
+	}
 
 	/*
 	 * Now ensure any default buffer modes from the startup file are

mg.1

@@ -1,7 +1,7 @@
-.\"	$OpenBSD: mg.1,v 1.135 2023/06/28 08:37:52 op Exp $
+.\"	$OpenBSD: mg.1,v 1.136 2023/10/16 08:33:16 op Exp $
 .\" This file is in the public domain.
 .\"
-.Dd $Mdocdate: June 28 2023 $
+.Dd $Mdocdate: October 16 2023 $
 .Dt MG 1
 .Os
 .Sh NAME
@@ -944,6 +944,9 @@ Provide the text in region to the shell command as input.
 Shrink current window by one line.
 The window immediately below is expanded to pick up the slack.
 If only one window is present, this command has no effect.
+.It Ic space-to-tabstop
+Insert enough spaces to reach the next tab-stop position.
+By default, tab-stops occur every 8 characters.
 .It Ic split-window-vertically
 Split the current window.
 A window smaller than 3 lines cannot be split.