diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/tab-complete.c | 10 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 4 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 1 |
3 files changed, 1 insertions, 14 deletions
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 0ee94d73621..d1e421bc0f1 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -1674,9 +1674,7 @@ psql_completion(const char *text, int start, int end) completion_last_char = (end > start) ? text[end - start - 1] : '\0'; /* We usually want the append character to be a space. */ -#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER rl_completion_append_character = ' '; -#endif /* Clear a few things. */ completion_charp = NULL; @@ -4547,9 +4545,7 @@ psql_completion(const char *text, int start, int end) { COMPLETE_WITH_CONST(true, ""); /* Also, prevent Readline from appending stuff to the non-match */ -#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER rl_completion_append_character = '\0'; -#endif #ifdef HAVE_RL_COMPLETION_SUPPRESS_QUOTE rl_completion_suppress_quote = 1; #endif @@ -5078,10 +5074,8 @@ _complete_from_query(const char *simple_query, * space afterwards. Otherwise the schema will stop being part of the * completion subject text, which is not what we want. */ -#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER if (num_schema_only > 0 && num_query_other == 0 && num_keywords == 0) rl_completion_append_character = '\0'; -#endif /* No more matches, so free the result structure and return null */ PQclear(result); @@ -5368,10 +5362,8 @@ complete_from_files(const char *text, int state) Assert(*retend == '\''); *retend = '/'; - /* Try to prevent libedit from adding a space, too */ -#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER + /* Prevent libedit from adding a space, too */ rl_completion_append_character = '\0'; -#endif } } diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 9d9bd6b9efc..912efdbbd12 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -460,10 +460,6 @@ /* Define to 1 if you have the `readv' function. */ #undef HAVE_READV -/* Define to 1 if you have the global variable - 'rl_completion_append_character'. */ -#undef HAVE_RL_COMPLETION_APPEND_CHARACTER - /* Define to 1 if you have the `rl_completion_matches' function. */ #undef HAVE_RL_COMPLETION_MATCHES diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index e47c2d648cb..ed1c53000ff 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -347,7 +347,6 @@ sub GenerateFiles HAVE_READLINE_READLINE_H => undef, HAVE_READLINK => undef, HAVE_READV => undef, - HAVE_RL_COMPLETION_APPEND_CHARACTER => undef, HAVE_RL_COMPLETION_MATCHES => undef, HAVE_RL_COMPLETION_SUPPRESS_QUOTE => undef, HAVE_RL_FILENAME_COMPLETION_FUNCTION => undef, |