Fixing compilation with --enable-tabcomp and tiny.

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

diff --git a/ChangeLog b/ChangeLog
index 832b0f94c2ec1f4a506d7164c571a38732b9917b..3ddaa1f8e7296eeff19f2668c168f8da8c24629e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
        * src/global.c (shortcut_init): Fix warnings with --enable-help.
        * src/text.c (do_justify): Fix compilation with --enable-justify.
        * src/nano.c (do_mouse): Fix warning with --enable-mouse.
+       * src/prompt.c (get_prompt_string): Fix compilation for the
+       combination of --enable-tiny with --enable-tabcomp.
 
 2014-04-03  Benno Schulenberg  <bensberg@justemail.net>
        * configure.ac: Remove unused '*_support' variables.

diff --git a/src/prompt.c b/src/prompt.c
index af6f3c7065ca2bce6ab7585af1816b99b889db37..8752ca7d7ddaa24aac1644c99fe4451f8b61e45a 100644 (file)
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -985,11 +985,9 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
 #ifndef DISABLE_TABCOMP
        if (s && s->scfunc != do_tab)
            tabbed = FALSE;
-#endif
 
-#ifndef DISABLE_TABCOMP
-#ifndef NANO_TINY
        if (s && s->scfunc == do_tab) {
+#ifndef NANO_TINY
                if (history_list != NULL) {
                    if (last_kbinput != sc_seq_or(do_tab, NANO_CONTROL_I))
                        complete_len = strlen(answer);