- Fix compliation breakage with --disable-justify, reported by Mike Frysinger

- Add --disable-justify to nano-regress so I stop missing that

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

diff --git a/nano-regress b/nano-regress
index 2fb8489f9d2171659f2d74c7f4ac72e780bfd3f6..92f1086fcf1629961275dea4302cc2afdc66eb29 100755 (executable)
--- a/nano-regress
+++ b/nano-regress
@@ -8,7 +8,7 @@ sub combinations {
   return @rest, map { [$first, @$_] } @rest;
 } 
 
-my @allargs=("--enable-debug", "--disable-extra", "--enable-tiny", "--disable-browser --disable-help --disable-mouse --disable-operatingdir --disable-speller", "--disable-multibuffer", "--disable-nanorc", "--with-slang");
+my @allargs=("--enable-debug", "--disable-justify", "--disable-extra", "--enable-tiny", "--disable-browser --disable-help --disable-mouse --disable-operatingdir --disable-speller", "--disable-multibuffer", "--disable-nanorc", "--with-slang");
 my @combos =  combinations(@allargs);
 
 my $i = 0;

diff --git a/src/global.c b/src/global.c
index 99ea969343f0f8c34cae80f91b6c210aa152b528..ce68df57a6c57e82f48f9344d07b78a0aeaed85e 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -1269,6 +1269,7 @@ void iso_me_harder_funcmap(short func)
        do_find_bracket();
     else if (func == DO_PREV_WORD_VOID)
        do_prev_word_void();
+#ifndef DISABLE_JUSTIFY
     else if (func == DO_JUSTIFY_VOID)
        do_justify_void();
     else if (func == DO_PARA_BEGIN_VOID)
@@ -1277,6 +1278,7 @@ void iso_me_harder_funcmap(short func)
        do_para_end_void();
     else if (func == DO_FULL_JUSTIFY)
        do_full_justify();
+#endif
     else if (func == DO_MARK)
        do_mark();
     else if (func == DO_RESEARCH)