[Nano-devel] [PATCH] rcfile.c: always keep entire list of valid keywords

[Mike Frysinger]

I like to use one .nanorc file on all my systems, but many may have
different compile time settings.  This means that the same .nanorc file
cannot be easily used without encountering:

Error in /home/vapier/.nanorc on line 17: Unknown flag "speller"
Press Enter to continue starting nano.

I think it makes more sense to have the valid keyword list always be the
same and only control whether the keyword actually results in behavior
change via ifdefs.

Signed-off-by: Mike Frysinger <address@hidden>
---
 src/rcfile.c |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/src/rcfile.c b/src/rcfile.c
index bd04169..5ac61cd 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -34,47 +34,28 @@
 
 static const rcoption rcopts[] = {
     {"boldtext", BOLD_TEXT},
-#ifndef DISABLE_JUSTIFY
     {"brackets", 0},
-#endif
     {"const", CONST_UPDATE},
-#ifndef DISABLE_WRAPJUSTIFY
     {"fill", 0},
-#endif
-#ifndef DISABLE_MOUSE
     {"mouse", USE_MOUSE},
-#endif
-#ifdef ENABLE_MULTIBUFFER
     {"multibuffer", MULTIBUFFER},
-#endif
     {"morespace", MORE_SPACE},
     {"nofollow", NOFOLLOW_SYMLINKS},
     {"nohelp", NO_HELP},
     {"nonewlines", NO_NEWLINES},
-#ifndef DISABLE_WRAPPING
     {"nowrap", NO_WRAP},
-#endif
-#ifndef DISABLE_OPERATINGDIR
     {"operatingdir", 0},
-#endif
     {"preserve", PRESERVE},
-#ifndef DISABLE_JUSTIFY
     {"punct", 0},
     {"quotestr", 0},
-#endif
     {"rebinddelete", REBIND_DELETE},
     {"rebindkeypad", REBIND_KEYPAD},
-#ifdef HAVE_REGEX_H
     {"regexp", USE_REGEXP},
-#endif
-#ifndef DISABLE_SPELLER
     {"speller", 0},
-#endif
     {"suspend", SUSPEND},
     {"tabsize", 0},
     {"tempfile", TEMP_FILE},
     {"view", VIEW_MODE},
-#ifndef NANO_TINY
     {"autoindent", AUTOINDENT},
     {"backup", BACKUP_FILE},
     {"backupdir", 0},
@@ -90,7 +71,6 @@ static const rcoption rcopts[] = {
     {"tabstospaces", TABS_TO_SPACES},
     {"whitespace", 0},
     {"wordbounds", WORD_BOUNDS},
-#endif
     {NULL, 0}
 };
 
-- 
1.6.0.6