- Fix globals and externs such that nano will compile with DISABLE_SPELLER (David Benbennick)
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1426 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
diff --git a/ChangeLog b/ChangeLog
index a12d815..464edf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
CVS code
- General:
- Translation updates (see po/ChangeLog for details).
+ - Fix globals and externs such that nano will compile with
+ DISABLE_SPELLER (David Benbennick).
- nano.c:
main()
- Fix nano not compiling with ENABLE_RCFILE and DISABLE_TABCOMP
diff --git a/global.c b/global.c
index 66ef3a7..fc0f0cc 100644
--- a/global.c
+++ b/global.c
@@ -105,7 +105,6 @@
shortcut *replace_list = NULL;
shortcut *replace_list_2 = NULL; /* 2nd half of replace dialog */
shortcut *goto_list = NULL;
-shortcut *gotodir_list = NULL;
shortcut *writefile_list = NULL;
shortcut *insertfile_list = NULL;
#ifndef DISABLE_HELP
@@ -119,7 +118,9 @@
#endif
#ifndef DISABLE_BROWSER
shortcut *browser_list = NULL;
+shortcut *gotodir_list = NULL;
#endif
+
#ifdef ENABLE_COLOR
const colortype *colorstrings = NULL;
syntaxtype *syntaxes = NULL;
diff --git a/nano.c b/nano.c
index 4ac10f3..e80ee1d 100644
--- a/nano.c
+++ b/nano.c
@@ -341,6 +341,7 @@
"complete the directory name.\n\n The following function "
"keys are available in Browser Go To Directory mode:\n\n");
#endif
+#ifndef DISABLE_SPELLER
else if (currshortcut == spell_list)
ptr = _("Spell Check Help Text\n\n "
"The spell checker checks the spelling of all text "
@@ -350,6 +351,7 @@
"instance of the given misspelled word in the "
"current file.\n\n The following other functions are "
"available in Spell Check mode:\n\n");
+#endif
#ifndef NANO_SMALL
else if (currshortcut == extcmd_list)
ptr = _("External Command Help Text\n\n "
diff --git a/proto.h b/proto.h
index e572a85..305ecc9 100644
--- a/proto.h
+++ b/proto.h
@@ -86,15 +86,23 @@
extern shortcut *main_list, *whereis_list;
extern shortcut *replace_list, *goto_list;
extern shortcut *writefile_list, *insertfile_list;
-extern shortcut *spell_list, *replace_list_2;
+extern shortcut *replace_list_2;
#ifndef NANO_SMALL
extern shortcut *extcmd_list;
#endif
+#ifndef DISABLE_HELP
extern shortcut *help_list;
+#endif
+#ifndef DISABLE_SPELLER
+extern shortcut *spell_list;
+#endif
#ifndef DISABLE_BROWSER
extern shortcut *browser_list, *gotodir_list;
#endif
+
+#if !defined(DISABLE_BROWSER) || !defined(DISABLE_HELP) || (!defined(DISABLE_MOUSE) && defined(NCURSES_MOUSE_VERSION))
extern const shortcut *currshortcut;
+#endif
#ifdef HAVE_REGEX_H
extern int use_regexp, regexp_compiled;