Changed --disable-spell to --disable-speller
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@389 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
b5bb24c949
commit
7b36c52efc
|
@ -1,4 +1,7 @@
|
||||||
CVS code -
|
CVS code -
|
||||||
|
General
|
||||||
|
- Changed --disable-spell to --disable speller. The term is
|
||||||
|
"speller" for -s, so it should be --disable-speller.
|
||||||
- files.c:
|
- files.c:
|
||||||
write_file()
|
write_file()
|
||||||
- Added tmp check to TMP_OPT section (how apropriate).
|
- Added tmp check to TMP_OPT section (how apropriate).
|
||||||
|
|
|
@ -34,6 +34,6 @@
|
||||||
#undef DISABLE_JUSTIFY
|
#undef DISABLE_JUSTIFY
|
||||||
|
|
||||||
/* Define this to disable the use(full|less) spelling functions */
|
/* Define this to disable the use(full|less) spelling functions */
|
||||||
#undef DISABLE_SPELL
|
#undef DISABLE_SPELLER
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
#undef DISABLE_JUSTIFY
|
#undef DISABLE_JUSTIFY
|
||||||
|
|
||||||
/* Define this to disable the use(full|less) spelling functions */
|
/* Define this to disable the use(full|less) spelling functions */
|
||||||
#undef DISABLE_SPELL
|
#undef DISABLE_SPELLER
|
||||||
|
|
||||||
/* Define if you have the __argz_count function. */
|
/* Define if you have the __argz_count function. */
|
||||||
#undef HAVE___ARGZ_COUNT
|
#undef HAVE___ARGZ_COUNT
|
||||||
|
|
|
@ -1322,12 +1322,12 @@ EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Check whether --enable-spell or --disable-spell was given.
|
# Check whether --enable-speller or --disable-speller was given.
|
||||||
if test "${enable_spell+set}" = set; then
|
if test "${enable_speller+set}" = set; then
|
||||||
enableval="$enable_spell"
|
enableval="$enable_speller"
|
||||||
if test x$enableval != xyes; then
|
if test x$enableval != xyes; then
|
||||||
cat >> confdefs.h <<\EOF
|
cat >> confdefs.h <<\EOF
|
||||||
#define DISABLE_SPELL 1
|
#define DISABLE_SPELLER 1
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -39,10 +39,10 @@ AC_ARG_ENABLE(justify,
|
||||||
AC_DEFINE(DISABLE_JUSTIFY)
|
AC_DEFINE(DISABLE_JUSTIFY)
|
||||||
fi])
|
fi])
|
||||||
|
|
||||||
AC_ARG_ENABLE(spell,
|
AC_ARG_ENABLE(speller,
|
||||||
[ --disable-speller Disables spell checker function],
|
[ --disable-speller Disables spell checker function],
|
||||||
[if test x$enableval != xyes; then
|
[if test x$enableval != xyes; then
|
||||||
AC_DEFINE(DISABLE_SPELL)
|
AC_DEFINE(DISABLE_SPELLER)
|
||||||
fi])
|
fi])
|
||||||
|
|
||||||
AC_MSG_CHECKING(whether to use slang)
|
AC_MSG_CHECKING(whether to use slang)
|
||||||
|
|
14
nano.c
14
nano.c
|
@ -440,8 +440,8 @@ void version(void)
|
||||||
#ifdef DISABLE_JUSTIFY
|
#ifdef DISABLE_JUSTIFY
|
||||||
printf(" --disable-justify");
|
printf(" --disable-justify");
|
||||||
#endif
|
#endif
|
||||||
#ifdef DISABLE_SPELL
|
#ifdef DISABLE_SPELLER
|
||||||
printf(" --disable-spell");
|
printf(" --disable-speller");
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_SLANG
|
#ifdef USE_SLANG
|
||||||
printf(" --with-slang");
|
printf(" --with-slang");
|
||||||
|
@ -514,7 +514,7 @@ void nano_small_msg(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(DISABLE_JUSTIFY) || defined(DISABLE_SPELL)
|
#if defined(DISABLE_JUSTIFY) || defined(DISABLE_SPELLER)
|
||||||
void nano_disabled_msg(void)
|
void nano_disabled_msg(void)
|
||||||
{
|
{
|
||||||
statusbar("Sorry, support for this function has been disabled");
|
statusbar("Sorry, support for this function has been disabled");
|
||||||
|
@ -1102,7 +1102,7 @@ void wrap_reset(void)
|
||||||
UNSET(SAMELINEWRAP);
|
UNSET(SAMELINEWRAP);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(NANO_SMALL) && !defined(DISABLE_SPELL)
|
#if !defined(NANO_SMALL) && !defined(DISABLE_SPELLER)
|
||||||
|
|
||||||
int do_int_spell_fix(char *word)
|
int do_int_spell_fix(char *word)
|
||||||
{
|
{
|
||||||
|
@ -1170,7 +1170,7 @@ int do_int_spell_fix(char *word)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(NANO_SMALL) && !defined(DISABLE_SPELL)
|
#if !defined(NANO_SMALL) && !defined(DISABLE_SPELLER)
|
||||||
|
|
||||||
/* Integrated spell checking using 'spell' program */
|
/* Integrated spell checking using 'spell' program */
|
||||||
int do_int_speller(char *tempfile_name)
|
int do_int_speller(char *tempfile_name)
|
||||||
|
@ -1300,7 +1300,7 @@ int do_int_speller(char *tempfile_name)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(NANO_SMALL) && !defined(DISABLE_SPELL)
|
#if !defined(NANO_SMALL) && !defined(DISABLE_SPELLER)
|
||||||
|
|
||||||
/* External spell checking */
|
/* External spell checking */
|
||||||
int do_alt_speller(char *file_name)
|
int do_alt_speller(char *file_name)
|
||||||
|
@ -1355,7 +1355,7 @@ int do_spell(void)
|
||||||
#if defined(NANO_SMALL)
|
#if defined(NANO_SMALL)
|
||||||
nano_small_msg();
|
nano_small_msg();
|
||||||
return (TRUE);
|
return (TRUE);
|
||||||
#elif defined(DISABLE_SPELL)
|
#elif defined(DISABLE_SPELLER)
|
||||||
nano_disabled_msg();
|
nano_disabled_msg();
|
||||||
return (TRUE);
|
return (TRUE);
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue