tweaks: when allow_tabs is FALSE, allow_files is irrelevant

In that case setting the latter to TRUE is misleading.  So don't do that.
master
Benno Schulenberg 2017-01-02 20:33:56 +01:00
parent 0b0ddb1e5f
commit a381021ffc
3 changed files with 5 additions and 5 deletions

View File

@ -672,7 +672,7 @@ int filesearch_init(void)
/* This is now one simple call. It just does a lot. */ /* This is now one simple call. It just does a lot. */
input = do_prompt(FALSE, input = do_prompt(FALSE,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
TRUE, FALSE,
#endif #endif
MWHEREISFILE, NULL, MWHEREISFILE, NULL,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES

View File

@ -149,7 +149,7 @@ int search_init(bool replacing, bool use_answer)
/* This is now one simple call. It just does a lot. */ /* This is now one simple call. It just does a lot. */
i = do_prompt(FALSE, i = do_prompt(FALSE,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
TRUE, FALSE,
#endif #endif
replacing ? MREPLACE : MWHEREIS, backupstring, replacing ? MREPLACE : MWHEREIS, backupstring,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
@ -787,7 +787,7 @@ void do_replace(void)
i = do_prompt(FALSE, i = do_prompt(FALSE,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
TRUE, FALSE,
#endif #endif
MREPLACEWITH, NULL, MREPLACEWITH, NULL,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
@ -856,7 +856,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
/* Ask for the line and column. */ /* Ask for the line and column. */
int i = do_prompt(FALSE, int i = do_prompt(FALSE,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
TRUE, FALSE,
#endif #endif
MGOTOLINE, use_answer ? answer : NULL, MGOTOLINE, use_answer ? answer : NULL,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES

View File

@ -2666,7 +2666,7 @@ bool do_int_spell_fix(const char *word)
/* Let the user supply a correctly spelled alternative. */ /* Let the user supply a correctly spelled alternative. */
proceed = (do_prompt(FALSE, proceed = (do_prompt(FALSE,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
TRUE, FALSE,
#endif #endif
MSPELL, word, MSPELL, word,
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES