nano

commit 7c2f53b2a9d71c09c2d210ce565ca2fdf8d31f0c
parent 3021a04c1c59ddb40905cbf3948a5934a4864be8
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Thu, 18 Jun 2015 18:51:27 +0000

Allowing a tiny nano to enable search and position histories.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5256 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
4
++++
M
src/rcfile.c
 | 
16
+++++++++-------

2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,8 @@
 2015-06-17  Benno Schulenberg  <bensberg@justemail.net>
+	* src/rcfile.c: Allow a tiny nano's ~/.nanorc to enable search and
+	position histories.  Also sort the options more strictly.
+
+2015-06-17  Benno Schulenberg  <bensberg@justemail.net>
 	* src/text.c (do_undo, add_undo): When undoing a Backspace at the tail
 	of the file and nonewlines is not set, then don't add another newline
 	but just reposition the cursor.  Also, when doing a Delete at the tail
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -42,16 +42,16 @@ static const rcoption rcopts[] = {
 #ifndef DISABLE_WRAPJUSTIFY
     {"fill", 0},
 #endif
-#ifndef NANO_TINY
-    {"locking", LOCKING},
+#ifndef DISABLE_HISTORIES
+    {"historylog", HISTORYLOG},
 #endif
+    {"morespace", MORE_SPACE},
 #ifndef DISABLE_MOUSE
     {"mouse", USE_MOUSE},
 #endif
 #ifndef DISABLE_MULTIBUFFER
     {"multibuffer", MULTIBUFFER},
 #endif
-    {"morespace", MORE_SPACE},
     {"nofollow", NOFOLLOW_SYMLINKS},
     {"nohelp", NO_HELP},
     {"nonewlines", NO_NEWLINES},
@@ -61,6 +61,9 @@ static const rcoption rcopts[] = {
 #ifndef DISABLE_OPERATINGDIR
     {"operatingdir", 0},
 #endif
+#ifndef DISABLE_HISTORIES
+    {"poslog", POS_HISTORY},
+#endif
     {"preserve", PRESERVE},
 #ifndef DISABLE_JUSTIFY
     {"punct", 0},
@@ -79,19 +82,18 @@ static const rcoption rcopts[] = {
     {"tempfile", TEMP_FILE},
     {"view", VIEW_MODE},
 #ifndef NANO_TINY
+    {"allow_insecure_backup", INSECURE_BACKUP},
     {"autoindent", AUTOINDENT},
     {"backup", BACKUP_FILE},
-    {"allow_insecure_backup", INSECURE_BACKUP},
     {"backupdir", 0},
     {"backwards", BACKWARDS_SEARCH},
     {"casesensitive", CASE_SENSITIVE},
     {"cut", CUT_TO_END},
-    {"historylog", HISTORYLOG},
+    {"locking", LOCKING},
     {"matchbrackets", 0},
     {"noconvert", NO_CONVERT},
-    {"poslog", POS_HISTORY},
-    {"quiet", QUIET},
     {"quickblank", QUICK_BLANK},
+    {"quiet", QUIET},
     {"smarthome", SMART_HOME},
     {"smooth", SMOOTH_SCROLL},
     {"tabstospaces", TABS_TO_SPACES},