nano

commit ee979ae7b3824e3ce63942b43016953ef70cb039
parent 401e43969c5dda4d966a04e1ffaaf257a5f7d612
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Fri, 25 Jan 2019 16:31:36 +0100

options: add -e, --emptyline, the counterpart of --morespace

Diffstat:
M
src/nano.c
 | 
14
++++++++++++--
M
src/nano.h
 | 
3
++-

2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/nano.c b/src/nano.c
@@ -850,6 +850,7 @@ void usage(void)
 	print_opt("-c", "--constantshow", N_("Constantly show cursor position"));
 	print_opt("-d", "--rebinddelete",
 					N_("Fix Backspace/Delete confusion problem"));
+	print_opt("-e", "--emptyline", N_("Keep the line below the title bar empty"));
 	print_opt("-f", "--finalnewline", N_("Ensure that text ends with a newline"));
 #ifdef ENABLE_BROWSER
 	if (!ISSET(RESTRICTED))
@@ -1983,6 +1984,7 @@ int main(int argc, char **argv)
 #endif
 		{"constantshow", 0, NULL, 'c'},
 		{"rebinddelete", 0, NULL, 'd'},
+		{"emptyline", 0, NULL, 'e'},
 		{"finalnewline", 0, NULL, 'f'},
 #ifdef ENABLE_BROWSER
 		{"showcursor", 0, NULL, 'g'},
@@ -2090,7 +2092,7 @@ int main(int argc, char **argv)
 
 	while ((optchr =
 		getopt_long(argc, argv,
-				"ABC:DEFGHIKLMNOPQ:RST:UVWX:Y:Zabcdfghijklmno:pr:s:tuvwxyz$",
+				"ABC:DEFGHIKLMNOPQ:RST:UVWX:Y:Zabcdefghijklmno:pr:s:tuvwxyz$",
 				long_options, NULL)) != -1) {
 		switch (optchr) {
 #ifndef NANO_TINY
@@ -2149,7 +2151,7 @@ int main(int argc, char **argv)
 				break;
 #endif
 			case 'O':
-				SET(MORE_SPACE);
+				UNSET(EMPTY_LINE);
 				break;
 #ifdef ENABLE_HISTORIES
 			case 'P':
@@ -2214,6 +2216,9 @@ int main(int argc, char **argv)
 			case 'd':
 				SET(REBIND_DELETE);
 				break;
+			case 'e':
+				SET(EMPTY_LINE);
+				break;
 			case 'f':
 				SET(FINAL_NEWLINE);
 				break;
@@ -2426,6 +2431,11 @@ int main(int argc, char **argv)
 	else
 		SET(SMOOTH_SCROLL);
 
+	if (ISSET(EMPTY_LINE))
+		UNSET(MORE_SPACE);
+	else
+		SET(MORE_SPACE);
+
 	/* If the user wants bold instead of reverse video for hilited text... */
 	if (ISSET(BOLD_TEXT))
 		hilite_attribute = A_BOLD;
diff --git a/src/nano.h b/src/nano.h
@@ -543,7 +543,8 @@ enum
 	LET_THEM_ZAP,
 	BREAK_LONG_LINES,
 	FINAL_NEWLINE,
-	JUMPY_SCROLLING
+	JUMPY_SCROLLING,
+	EMPTY_LINE
 };
 
 /* Flags for the menus in which a given function should be present. */