Treating the formatter like a speller,

to fix compilation with --disable-speller.
This fixes Savannah bug #44607.

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

diff --git a/ChangeLog b/ChangeLog
index 96faecd396b7cea04be881a11453962da2419f24..999940925ba022d80f4b23f38d8400314437fde9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
        a Replace All with *lots* of occurrences.
        * src/{color,global,nano,text,utils}.c:  Normalize some whitespace.
        * src/global.c (strtosc): The linter is only available when colour is.
+       * src/global.c, src/text.c: Treat the formatter like a speller, to fix
+       compilation with --disable-speller.  Fixes Savannah bug #44607.
 
 2015-03-25  Benno Schulenberg  <bensberg@justemail.net>
        * doc/syntax/debian.nanorc: Slightly widen and relax the header regex.

diff --git a/src/global.c b/src/global.c
index 4643af2add38eb26cb01c951f27b097676794e59..27ff938dd67b00a441852cc8742b8b8c743dca03 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -639,8 +639,10 @@ void shortcut_init(void)
     const char *nano_lint_msg = N_("Invoke the linter, if available");
     const char *nano_prevlint_msg = N_("Go to previous linter msg");
     const char *nano_nextlint_msg = N_("Go to next linter msg");
+#ifndef DISABLE_SPELLER
     const char *nano_formatter_msg = N_("Invoke formatter, if available");
 #endif
+#endif
 #endif /* !DISABLE_HELP */
 
 #ifndef DISABLE_HELP
@@ -736,9 +738,11 @@ void shortcut_init(void)
 #ifndef DISABLE_COLOR
     add_to_funcs(do_linter, MMAIN,
        N_("To Linter"), IFSCHELP(nano_lint_msg), TOGETHER, NOVIEW);
+#ifndef DISABLE_SPELLER
     add_to_funcs(do_formatter, MMAIN,
        N_("Formatter"), IFSCHELP(nano_formatter_msg), BLANKAFTER, NOVIEW);
 #endif
+#endif
 
 #ifndef NANO_TINY
     add_to_funcs(case_sens_void, MWHEREIS|MREPLACE,
@@ -1006,12 +1010,14 @@ void shortcut_init(void)
 #ifndef DISABLE_SPELLER
     add_to_sclist(MMAIN, "^T", do_spell, 0);
     add_to_sclist(MMAIN, "F12", do_spell, 0);
+#ifndef DISABLE_COLOR
+    add_to_sclist(MMAIN, "^T", do_formatter, 0);
+    add_to_sclist(MMAIN, "F12", do_formatter, 0);
+#endif
 #else
 #ifndef DISABLE_COLOR
     add_to_sclist(MMAIN, "^T", do_linter, 0);
     add_to_sclist(MMAIN, "F12", do_linter, 0);
-    add_to_sclist(MMAIN, "^T", do_formatter, 0);
-    add_to_sclist(MMAIN, "F12", do_formatter, 0);
 #endif
 #endif
     add_to_sclist(MMAIN, "^C", do_cursorpos_void, 0);

diff --git a/src/text.c b/src/text.c
index 8814b498089c15ff79e8d000a714d39298ce5c6c..98b2f802c025e28b94bc2e01c1f0b23b93e4f8f6 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -3223,6 +3223,7 @@ free_lints_and_return:
     lint_cleanup();
 }
 
+#ifndef DISABLE_SPELLER
 /* Run a formatter for the given syntax.
  * Expects the formatter to be non-interactive and
  * operate on a file in-place, which we'll pass it
@@ -3370,7 +3371,7 @@ void do_formatter(void)
 
     statusbar(finalstatus);
 }
-
+#endif /* !DISABLE_SPELLER */
 #endif /* !DISABLE_COLOR */
 
 #ifndef NANO_TINY