From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 4 Apr 2014 19:21:56 +0000 (+0000)
Subject: Fixing compilation with --enable-tabcomp and tiny.
X-Git-Tag: v2.3.3~202
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=062bca7c41196bde3d9e93c7ea866f8a7fa26f4d;p=nano.git

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 832b0f94..3ddaa1f8 100644
--- 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 af6f3c70..8752ca7d 100644
--- 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);