Updated delete-blanks to allow deleting all blank lines in the file.

smaclennan · smaclennan · commit 09d25977bb03 · 2016-01-17T14:19:13.000-05:00
diff --git a/cnames.c b/cnames.c
@@ -96,9 +96,10 @@ struct cnames Cnames[] = {
 	{"ctrl-x",			ZCTRL_X,		0,
 	 C("Command prefix.")
 	},
-	{"delete-blanks",		ZDELETE_BLANKS,		AN,
-	 C("Delete all the blank lines around the Point. The lines are not "
-	   "put in the Kill Buffer.")
+	{"delete-blanks",		ZDELETE_BLANKS,		0,
+	 C("Delete all the blank lines around the Point. With a Universal Argument "
+	   "all blanks lines in the file are deleted. The lines are NOT put in the "
+	   "Kill Buffer.")
 	},
 	{"delete-buffer",		ZDELETE_BUFFER,		0,
 	 C("Deletes the current buffer and goes to a previous buffer. There "
diff --git a/delete.c b/delete.c
@@ -202,27 +202,51 @@ void Zdelete_blanks(void)
 {
 	struct mark *pmark = bcremark(Bbuff);
 	struct mark *tmark = bcremark(Bbuff);
-	if (pmark && tmark) {
-		if (bcrsearch(Bbuff, NL)) {
-			bmove1(Bbuff);
-			bmrktopnt(Bbuff, tmark);
-			movepast(isspace, BACKWARD);
-			if (!bisstart(Bbuff))
-				bcsearch(Bbuff, NL);
-			if (bisbeforemrk(Bbuff, tmark))
-				bdeltomrk(tmark);
+	if (!pmark || !tmark) {
+		tbell();
+		goto done;
+	}
+
+	if (Argp) {
+		regexp_t re;
+		Arg = 0;
+
+		if (re_compile(&re, "^[ \t]*\r?$", REG_EXTENDED)) {
+			error("Internal re error.");
+			goto done;
 		}
-		if (bcsearch(Bbuff, NL)) {
-			bmrktopnt(Bbuff, tmark);
-			movepast(isspace, FORWARD);
-			if (bcrsearch(Bbuff, NL))
-				bmove1(Bbuff);
-			if (bisaftermrk(Bbuff, tmark))
-				bdeltomrk(tmark);
+
+		btostart(Bbuff);
+		while (re_step(Bbuff, &re, tmark)) {
+			bmove1(Bbuff); /* skip over the NL */
+			bdeltomrk(tmark);
 		}
-	} else
-		tbell();
-	bpnttomrk(Bbuff, pmark);
+
+		re_free(&re);
+		goto done;
+	}
+
+	if (bcrsearch(Bbuff, NL)) {
+		bmove1(Bbuff);
+		bmrktopnt(Bbuff, tmark);
+		movepast(isspace, BACKWARD);
+		if (!bisstart(Bbuff))
+			bcsearch(Bbuff, NL);
+		if (bisbeforemrk(Bbuff, tmark))
+			bdeltomrk(tmark);
+	}
+	if (bcsearch(Bbuff, NL)) {
+		bmrktopnt(Bbuff, tmark);
+		movepast(isspace, FORWARD);
+		if (bcrsearch(Bbuff, NL))
+			bmove1(Bbuff);
+		if (bisaftermrk(Bbuff, tmark))
+			bdeltomrk(tmark);
+	}
+
+done:
+	if (pmark)
+		bpnttomrk(Bbuff, pmark);
 	unmark(pmark);
 	unmark(tmark);
 }
