commit c3e74f02c2521da9e7237277efb30e74ce3a17c0
parent cb56cd70f596722537266891a9009c5c5bb3a15e
Author: Benno Schulenberg <bensberg@telfort.nl>
Date: Mon, 21 Sep 2020 17:04:10 +0200
build: exclude --emptyline, --jumpyscrolling, and --noread from tiny nano
When looking at the output of 'nano --help', why confuse the user with
a cosmetic option, an awkward behavioral one, and an obscure one?
Diffstat:
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/move.c b/src/move.c
@@ -115,6 +115,7 @@ void do_page_up(void)
int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
size_t leftedge, target_column;
+#ifndef NANO_TINY
/* If we're not in smooth scrolling mode, put the cursor at the
* beginning of the top line of the edit window, as Pico does. */
if (ISSET(JUMPY_SCROLLING)) {
@@ -123,6 +124,7 @@ void do_page_up(void)
openfile->current_y = 0;
target_column = 0;
} else
+#endif
get_edge_and_target(&leftedge, &target_column);
/* Move up the required number of lines or chunks. If we can't, we're
@@ -145,6 +147,7 @@ void do_page_down(void)
int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
size_t leftedge, target_column;
+#ifndef NANO_TINY
/* If we're not in smooth scrolling mode, put the cursor at the
* beginning of the top line of the edit window, as Pico does. */
if (ISSET(JUMPY_SCROLLING)) {
@@ -153,6 +156,7 @@ void do_page_down(void)
openfile->current_y = 0;
target_column = 0;
} else
+#endif
get_edge_and_target(&leftedge, &target_column);
/* Move down the required number of lines or chunks. If we can't, we're
diff --git a/src/nano.c b/src/nano.c
@@ -587,7 +587,9 @@ void usage(void)
print_opt("-c", "--constantshow", N_("Constantly show cursor position"));
print_opt("-d", "--rebinddelete",
N_("Fix Backspace/Delete confusion problem"));
+#ifndef NANO_TINY
print_opt("-e", "--emptyline", N_("Keep the line below the title bar empty"));
+#endif
#ifdef ENABLE_NANORC
print_opt(_("-f <file>"), _("--rcfile=<file>"),
N_("Use only this file for configuring nano"));
@@ -598,9 +600,7 @@ void usage(void)
print_opt("-h", "--help", N_("Show this help text and exit"));
#ifndef NANO_TINY
print_opt("-i", "--autoindent", N_("Automatically indent new lines"));
-#endif
print_opt("-j", "--jumpyscrolling", N_("Scroll per half-screen, not per line"));
-#ifndef NANO_TINY
print_opt("-k", "--cutfromcursor", N_("Cut from cursor to end of line"));
#endif
#ifdef ENABLE_LINENUMBERS
@@ -609,7 +609,9 @@ void usage(void)
#ifdef ENABLE_MOUSE
print_opt("-m", "--mouse", N_("Enable the use of the mouse"));
#endif
+#ifndef NANO_TINY
print_opt("-n", "--noread", N_("Do not read the file (only write it)"));
+#endif
#ifdef ENABLE_OPERATINGDIR
print_opt(_("-o <dir>"), _("--operatingdir=<dir>"),
N_("Set operating directory"));
@@ -1716,7 +1718,6 @@ int main(int argc, char **argv)
#endif
{"constantshow", 0, NULL, 'c'},
{"rebinddelete", 0, NULL, 'd'},
- {"emptyline", 0, NULL, 'e'},
#ifdef ENABLE_NANORC
{"rcfile", 1, NULL, 'f'},
#endif
@@ -1724,14 +1725,12 @@ int main(int argc, char **argv)
{"showcursor", 0, NULL, 'g'},
#endif
{"help", 0, NULL, 'h'},
- {"jumpyscrolling", 0, NULL, 'j'},
#ifdef ENABLE_LINENUMBERS
{"linenumbers", 0, NULL, 'l'},
#endif
#ifdef ENABLE_MOUSE
{"mouse", 0, NULL, 'm'},
#endif
- {"noread", 0, NULL, 'n'},
#ifdef ENABLE_OPERATINGDIR
{"operatingdir", 1, NULL, 'o'},
#endif
@@ -1767,8 +1766,11 @@ int main(int argc, char **argv)
{"wordchars", 1, NULL, 'X'},
{"zap", 0, NULL, 'Z'},
{"atblanks", 0, NULL, 'a'},
+ {"emptyline", 0, NULL, 'e'},
{"autoindent", 0, NULL, 'i'},
+ {"jumpyscrolling", 0, NULL, 'j'},
{"cutfromcursor", 0, NULL, 'k'},
+ {"noread", 0, NULL, 'n'},
{"indicator", 0, NULL, 'q'},
{"unix", 0, NULL, 'u'},
{"afterends", 0, NULL, 'y'},
@@ -1965,9 +1967,11 @@ int main(int argc, char **argv)
case 'd':
SET(REBIND_DELETE);
break;
+#ifndef NANO_TINY
case 'e':
SET(EMPTY_LINE);
break;
+#endif
#ifdef ENABLE_NANORC
case 'f':
custom_nanorc = mallocstrcpy(custom_nanorc, optarg);
@@ -1985,11 +1989,9 @@ int main(int argc, char **argv)
case 'i':
SET(AUTOINDENT);
break;
-#endif
case 'j':
SET(JUMPY_SCROLLING);
break;
-#ifndef NANO_TINY
case 'k':
SET(CUT_FROM_CURSOR);
break;
@@ -2004,9 +2006,11 @@ int main(int argc, char **argv)
SET(USE_MOUSE);
break;
#endif
+#ifndef NANO_TINY
case 'n':
SET(NOREAD_MODE);
break;
+#endif
#ifdef ENABLE_OPERATINGDIR
case 'o':
operating_dir = mallocstrcpy(operating_dir, optarg);
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -48,14 +48,12 @@ static const rcoption rcopts[] = {
#endif
{"casesensitive", CASE_SENSITIVE},
{"constantshow", CONSTANT_SHOW},
- {"emptyline", EMPTY_LINE},
#ifdef ENABLED_WRAPORJUSTIFY
{"fill", 0},
#endif
#ifdef ENABLE_HISTORIES
{"historylog", HISTORYLOG},
#endif
- {"jumpyscrolling", JUMPY_SCROLLING},
#ifdef ENABLE_LINENUMBERS
{"linenumbers", LINE_NUMBERS},
#endif
@@ -105,8 +103,10 @@ static const rcoption rcopts[] = {
{"backupdir", 0},
{"bookstyle", BOOKSTYLE},
{"cutfromcursor", CUT_FROM_CURSOR},
+ {"emptyline", EMPTY_LINE},
{"guidestripe", 0},
{"indicator", INDICATOR},
+ {"jumpyscrolling", JUMPY_SCROLLING},
{"locking", LOCKING},
{"matchbrackets", 0},
{"noconvert", NO_CONVERT},
