- 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-d3aeb78583b8master
parent
5ec68628ce
commit
201f1d976a
|
@ -1,6 +1,8 @@
|
||||||
CVS code
|
CVS code
|
||||||
- General:
|
- General:
|
||||||
- Translation updates (see po/ChangeLog for details).
|
- Translation updates (see po/ChangeLog for details).
|
||||||
|
- Fix globals and externs such that nano will compile with
|
||||||
|
DISABLE_SPELLER (David Benbennick).
|
||||||
- nano.c:
|
- nano.c:
|
||||||
main()
|
main()
|
||||||
- Fix nano not compiling with ENABLE_RCFILE and DISABLE_TABCOMP
|
- Fix nano not compiling with ENABLE_RCFILE and DISABLE_TABCOMP
|
||||||
|
|
3
global.c
3
global.c
|
@ -105,7 +105,6 @@ shortcut *whereis_list = NULL;
|
||||||
shortcut *replace_list = NULL;
|
shortcut *replace_list = NULL;
|
||||||
shortcut *replace_list_2 = NULL; /* 2nd half of replace dialog */
|
shortcut *replace_list_2 = NULL; /* 2nd half of replace dialog */
|
||||||
shortcut *goto_list = NULL;
|
shortcut *goto_list = NULL;
|
||||||
shortcut *gotodir_list = NULL;
|
|
||||||
shortcut *writefile_list = NULL;
|
shortcut *writefile_list = NULL;
|
||||||
shortcut *insertfile_list = NULL;
|
shortcut *insertfile_list = NULL;
|
||||||
#ifndef DISABLE_HELP
|
#ifndef DISABLE_HELP
|
||||||
|
@ -119,7 +118,9 @@ shortcut *extcmd_list = NULL;
|
||||||
#endif
|
#endif
|
||||||
#ifndef DISABLE_BROWSER
|
#ifndef DISABLE_BROWSER
|
||||||
shortcut *browser_list = NULL;
|
shortcut *browser_list = NULL;
|
||||||
|
shortcut *gotodir_list = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_COLOR
|
#ifdef ENABLE_COLOR
|
||||||
const colortype *colorstrings = NULL;
|
const colortype *colorstrings = NULL;
|
||||||
syntaxtype *syntaxes = NULL;
|
syntaxtype *syntaxes = NULL;
|
||||||
|
|
2
nano.c
2
nano.c
|
@ -341,6 +341,7 @@ void help_init(void)
|
||||||
"complete the directory name.\n\n The following function "
|
"complete the directory name.\n\n The following function "
|
||||||
"keys are available in Browser Go To Directory mode:\n\n");
|
"keys are available in Browser Go To Directory mode:\n\n");
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef DISABLE_SPELLER
|
||||||
else if (currshortcut == spell_list)
|
else if (currshortcut == spell_list)
|
||||||
ptr = _("Spell Check Help Text\n\n "
|
ptr = _("Spell Check Help Text\n\n "
|
||||||
"The spell checker checks the spelling of all text "
|
"The spell checker checks the spelling of all text "
|
||||||
|
@ -350,6 +351,7 @@ void help_init(void)
|
||||||
"instance of the given misspelled word in the "
|
"instance of the given misspelled word in the "
|
||||||
"current file.\n\n The following other functions are "
|
"current file.\n\n The following other functions are "
|
||||||
"available in Spell Check mode:\n\n");
|
"available in Spell Check mode:\n\n");
|
||||||
|
#endif
|
||||||
#ifndef NANO_SMALL
|
#ifndef NANO_SMALL
|
||||||
else if (currshortcut == extcmd_list)
|
else if (currshortcut == extcmd_list)
|
||||||
ptr = _("External Command Help Text\n\n "
|
ptr = _("External Command Help Text\n\n "
|
||||||
|
|
10
proto.h
10
proto.h
|
@ -86,15 +86,23 @@ extern shortcut *shortcut_list;
|
||||||
extern shortcut *main_list, *whereis_list;
|
extern shortcut *main_list, *whereis_list;
|
||||||
extern shortcut *replace_list, *goto_list;
|
extern shortcut *replace_list, *goto_list;
|
||||||
extern shortcut *writefile_list, *insertfile_list;
|
extern shortcut *writefile_list, *insertfile_list;
|
||||||
extern shortcut *spell_list, *replace_list_2;
|
extern shortcut *replace_list_2;
|
||||||
#ifndef NANO_SMALL
|
#ifndef NANO_SMALL
|
||||||
extern shortcut *extcmd_list;
|
extern shortcut *extcmd_list;
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef DISABLE_HELP
|
||||||
extern shortcut *help_list;
|
extern shortcut *help_list;
|
||||||
|
#endif
|
||||||
|
#ifndef DISABLE_SPELLER
|
||||||
|
extern shortcut *spell_list;
|
||||||
|
#endif
|
||||||
#ifndef DISABLE_BROWSER
|
#ifndef DISABLE_BROWSER
|
||||||
extern shortcut *browser_list, *gotodir_list;
|
extern shortcut *browser_list, *gotodir_list;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if !defined(DISABLE_BROWSER) || !defined(DISABLE_HELP) || (!defined(DISABLE_MOUSE) && defined(NCURSES_MOUSE_VERSION))
|
||||||
extern const shortcut *currshortcut;
|
extern const shortcut *currshortcut;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_REGEX_H
|
#ifdef HAVE_REGEX_H
|
||||||
extern int use_regexp, regexp_compiled;
|
extern int use_regexp, regexp_compiled;
|
||||||
|
|
Loading…
Reference in New Issue