From: Benno Schulenberg Date: Thu, 18 Jun 2015 18:51:27 +0000 (+0000) Subject: Allowing a tiny nano to enable search and position histories. X-Git-Tag: v2.4.2~21 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7c2f53b2a9d71c09c2d210ce565ca2fdf8d31f0c;p=nano.git 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 --- diff --git a/ChangeLog b/ChangeLog index f3bfd3ea..f2b26976 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-06-17 Benno Schulenberg + * 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 * 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 diff --git a/src/rcfile.c b/src/rcfile.c index abf9c07c..3382a0d9 100644 --- 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}, @@ -60,6 +60,9 @@ static const rcoption rcopts[] = { #endif #ifndef DISABLE_OPERATINGDIR {"operatingdir", 0}, +#endif +#ifndef DISABLE_HISTORIES + {"poslog", POS_HISTORY}, #endif {"preserve", PRESERVE}, #ifndef DISABLE_JUSTIFY @@ -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},