upstream changes

hboetes · Jun 14, 2022 · ea58e62 · ea58e62
1 parent b3c0b47
commit ea58e62
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/CVS/Entries b/CVS/Entries
@@ -10,7 +10,6 @@
 /README/1.14/Sun Aug  1 20:42:15 2021//
 /chrdef.h/1.10/Sun Aug  1 20:42:15 2021//
 /cinfo.c/1.18/Sun Aug  1 20:42:15 2021//
-/cmode.c/1.17/Sun Aug  1 20:42:15 2021//
 /display.c/1.48/Sun Aug  1 20:42:15 2021//
 /extend.c/1.75/Sun Aug  1 20:42:15 2021//
 /file.c/1.102/Sun Aug  1 20:42:15 2021//
@@ -29,10 +28,8 @@
 /window.c/1.36/Sun Aug  1 20:42:15 2021//
 /word.c/1.19/Sun Aug  1 20:42:15 2021//
 /autoexec.c/1.18/Sun Nov 21 22:19:09 2021//
-/basic.c/1.50/Sun Nov 21 22:19:09 2021//
 /bell.c/1.6/Sun Nov 21 22:19:09 2021//
 /buffer.c/1.112/Sun Nov 21 22:19:09 2021//
-/cscope.c/1.20/Sun Nov 21 22:19:09 2021//
 /dir.c/1.32/Sat Feb 12 21:09:39 2022//
 /echo.c/1.68/Sun Nov 21 22:19:09 2021//
 /funmap.c/1.63/Sun Nov 21 22:19:09 2021//
@@ -48,7 +45,10 @@
 /tags.c/1.17/Result of merge//
 /tty.c/1.39/Sun Nov 21 22:19:09 2021//
 /ttykbd.c/1.20/Sun Nov 21 22:19:09 2021//
-/util.c/1.43/Sun Nov 21 22:19:09 2021//
 /yank.c/1.15/Sun Nov 21 22:19:09 2021//
 /mg.1/1.126/Thu Mar 31 20:05:13 2022//
+/basic.c/1.51/Sat Jun 11 23:27:52 2022//
+/cmode.c/1.18/Sat Jun 11 23:27:52 2022//
+/cscope.c/1.21/Sat Jun 11 23:27:52 2022//
+/util.c/1.44/Sat Jun 11 23:27:52 2022//
 D
diff --git a/basic.c b/basic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: basic.c,v 1.50 2021/02/27 13:24:52 lum Exp $	*/
+/*	$OpenBSD: basic.c,v 1.51 2022/05/24 16:42:19 op Exp $	*/
 
 /* This file is in the public domain */
 
@@ -536,7 +536,7 @@ gotoline(int f, int n)
 			return (ABORT);
 		n = (int)strtonum(buf, INT_MIN, INT_MAX, &err);
 		if (err)
-			return(dobeep_msgs("Line number %s", err));
+			return(dobeep_msgs("Line number", err));
 	}
 	return(setlineno(n));
 }

diff --git a/cmode.c b/cmode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmode.c,v 1.17 2019/07/11 18:20:18 lum Exp $ */
+/* $OpenBSD: cmode.c,v 1.18 2022/05/24 16:24:31 op Exp $ */
 /*
  * This file is in the public domain.
  *
@@ -205,6 +205,8 @@ cc_lfindent(int f, int n)
 {
 	if (n < 0)
 		return (FALSE);
+	if (cc_strip_trailp)
+		(void)delwhite(FFRAND, 1);
 	if (enewline(FFRAND, 1) == FALSE)
 		return (FALSE);
 	return (cc_indent(FFRAND, n));

diff --git a/cscope.c b/cscope.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cscope.c,v 1.20 2021/03/01 10:51:14 lum Exp $	*/
+/*	$OpenBSD: cscope.c,v 1.21 2022/05/24 16:42:19 op Exp $	*/
 
 /*
  * This file is in the public domain.
@@ -185,9 +185,9 @@ cscreatelist(int f, int n)
 		return (FALSE);
 
 	if (stat(dir, &sb) == -1)
-		return(dobeep_msgs("stat: %s", strerror(errno)));
+		return(dobeep_msgs("stat:", strerror(errno)));
 	else if (S_ISDIR(sb.st_mode) == 0)
-		return(dobeep_msgs("%s: Not a directory", dir));
+		return(dobeep_msgs(dir, "Not a directory"));
 
 	if (csexists("cscope-indexer") == FALSE)
 		return(dobeep_msg("no such file or directory, cscope-indexer"));

diff --git a/util.c b/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.43 2021/03/01 10:51:14 lum Exp $	*/
+/*	$OpenBSD: util.c,v 1.44 2022/05/24 16:24:31 op Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -373,6 +373,7 @@ lfindent(int f, int n)
 				nicol |= 0x07;
 			++nicol;
 		}
+		(void)delwhite(FFRAND, 1);
 		if (lnewline() == FALSE || ((
 #ifdef	NOTAB
 		    curbp->b_flag & BFNOTAB) ? linsert(nicol, ' ') == FALSE : (