Changed --disable-spell to --disable-speller

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@389 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index e98a274c7a095d28328a3ea845d8655a89f9a192..e2152c3349d8119d74ab375c17d92c63e9f0e43f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 CVS code -
+General
+       - Changed --disable-spell to --disable speller.  The term is
+         "speller" for -s, so it should be --disable-speller.
 - files.c:
   write_file()
        - Added tmp check to TMP_OPT section (how apropriate).

diff --git a/acconfig.h b/acconfig.h
index ff15437a54b7721aab4cd0cfd56b71c8009e73bc..3a12a71e3bc019f0fcc0901ee6988e51fc25aaaa 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -34,6 +34,6 @@
 #undef DISABLE_JUSTIFY
 
 /* Define this to disable the use(full|less) spelling functions */
-#undef DISABLE_SPELL
+#undef DISABLE_SPELLER
 
 

diff --git a/config.h.in b/config.h.in
index ba4ad2d729e8379ad5826c66892f8cf77376032d..91e783aea42f403368c997bab3a0db273fb9ed51 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -86,7 +86,7 @@
 #undef DISABLE_JUSTIFY
 
 /* Define this to disable the use(full|less) spelling functions */
-#undef DISABLE_SPELL
+#undef DISABLE_SPELLER
 
 /* Define if you have the __argz_count function.  */
 #undef HAVE___ARGZ_COUNT

diff --git a/configure b/configure
index f1665b2d09d95195440378469d7a5c394694dcba..ac76f6281357500e3ca0a50a13f5c3315ffdc629 100755 (executable)
--- a/configure
+++ b/configure
@@ -1322,12 +1322,12 @@ EOF
 fi
 
 
-# Check whether --enable-spell or --disable-spell was given.
-if test "${enable_spell+set}" = set; then
-  enableval="$enable_spell"
+# Check whether --enable-speller or --disable-speller was given.
+if test "${enable_speller+set}" = set; then
+  enableval="$enable_speller"
   if test x$enableval != xyes; then
     cat >> confdefs.h <<\EOF
-#define DISABLE_SPELL 1
+#define DISABLE_SPELLER 1
 EOF
  
  fi

diff --git a/configure.in b/configure.in
index e134fa0b3fbacfbe461d448238262b2bd6faf335..18c091c598c18be3ff0f541dbc3a0b19fe846f56 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -39,10 +39,10 @@ AC_ARG_ENABLE(justify,
     AC_DEFINE(DISABLE_JUSTIFY) 
  fi])
 
-AC_ARG_ENABLE(spell,
+AC_ARG_ENABLE(speller,
 [  --disable-speller       Disables spell checker function],
  [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_SPELL) 
+    AC_DEFINE(DISABLE_SPELLER) 
  fi])
 
 AC_MSG_CHECKING(whether to use slang)

diff --git a/nano.c b/nano.c
index 954130c6e2b5c26329c22477ce22b82ecb1f15e6..e7893fd57167a6ab813a6e7022c695f2924da462 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -440,8 +440,8 @@ void version(void)
 #ifdef DISABLE_JUSTIFY
     printf(" --disable-justify");
 #endif
-#ifdef DISABLE_SPELL
-    printf(" --disable-spell");
+#ifdef DISABLE_SPELLER
+    printf(" --disable-speller");
 #endif
 #ifdef USE_SLANG
     printf(" --with-slang");
@@ -514,7 +514,7 @@ void nano_small_msg(void)
 }
 #endif
 
-#if defined(DISABLE_JUSTIFY) || defined(DISABLE_SPELL)
+#if defined(DISABLE_JUSTIFY) || defined(DISABLE_SPELLER)
 void nano_disabled_msg(void)
 {
     statusbar("Sorry, support for this function has been disabled");
@@ -1102,7 +1102,7 @@ void wrap_reset(void)
     UNSET(SAMELINEWRAP);
 }
 
-#if !defined(NANO_SMALL) && !defined(DISABLE_SPELL)
+#if !defined(NANO_SMALL) && !defined(DISABLE_SPELLER)
 
 int do_int_spell_fix(char *word)
 {
@@ -1170,7 +1170,7 @@ int do_int_spell_fix(char *word)
 }
 #endif
 
-#if !defined(NANO_SMALL) && !defined(DISABLE_SPELL)
+#if !defined(NANO_SMALL) && !defined(DISABLE_SPELLER)
 
 /* Integrated spell checking using 'spell' program */
 int do_int_speller(char *tempfile_name)
@@ -1300,7 +1300,7 @@ int do_int_speller(char *tempfile_name)
 }
 #endif
 
-#if !defined(NANO_SMALL) && !defined(DISABLE_SPELL)
+#if !defined(NANO_SMALL) && !defined(DISABLE_SPELLER)
 
 /* External spell checking */
 int do_alt_speller(char *file_name)
@@ -1355,7 +1355,7 @@ int do_spell(void)
 #if defined(NANO_SMALL)
     nano_small_msg();
     return (TRUE);
-#elif defined(DISABLE_SPELL)
+#elif defined(DISABLE_SPELLER)
     nano_disabled_msg();
     return (TRUE);
 #else