Cutting down on the size of tiny nano.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4909 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
diff --git a/ChangeLog b/ChangeLog
index 4a549bc..76be30b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-25 Benno Schulenberg <bensberg@justemail.net>
+ * src/global.c: Cut down on the size of tiny nano, by not compiling
+ the function strtosc() when --disable-nanorc is given or implied.
+
2014-05-25 Mark Majeres <mark@engine12.com>
* src/chars.c (addstrings): New function, concatenates two allocated
strings, tacking the second onto the first and freeing the second.
diff --git a/src/global.c b/src/global.c
index b65f2c7..9ba3ebb 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1257,6 +1257,7 @@
}
#endif /* !NANO_TINY */
+#ifndef DISABLE_NANORC
/* Interpret a function string given in the rc file, and return a
* shortcut struct, complete with the proper value for execute. */
sc *strtosc(char *input)
@@ -1529,8 +1530,7 @@
return s;
}
-#ifndef DISABLE_NANORC
-/* Same thing as above but for the menu. */
+/* Interpret a menu name and return the corresponding menu flag. */
int strtomenu(char *input)
{
if (!strcasecmp(input, "all"))
@@ -1553,22 +1553,27 @@
else if (!strcasecmp(input, "externalcmd") ||
!strcasecmp(input, "extcmd"))
return MEXTCMD;
+#ifndef DISABLE_HELP
else if (!strcasecmp(input, "help"))
return MHELP;
+#endif
+#ifndef DISABLE_SPELLER
else if (!strcasecmp(input, "spell"))
return MSPELL;
+#endif
else if (!strcasecmp(input, "linter"))
return MLINTER;
+#ifndef DISABLE_BROWSER
else if (!strcasecmp(input, "browser"))
return MBROWSER;
else if (!strcasecmp(input, "whereisfile"))
return MWHEREISFILE;
else if (!strcasecmp(input, "gotodir"))
return MGOTODIR;
-
+#endif
return -1;
}
-#endif
+#endif /* !DISABLE_NANORC */
#ifdef DEBUG