diff options
| author | Peter Eisentraut | 2000-10-03 19:50:21 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2000-10-03 19:50:21 +0000 |
| commit | 831e78e0c4cc6b83d3096ea483a49c4dc2a3e867 (patch) | |
| tree | 941e45a0905e4f3ad9d4e92b4f29180f58800fb2 /src/bin | |
| parent | 1b7332fbabe6359b9bdb3d0417279223002622ea (diff) | |
Better coding of readline tests
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/psql/input.h | 4 | ||||
| -rw-r--r-- | src/bin/psql/tab-complete.c | 14 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h index 557179113b9..69387989faa 100644 --- a/src/bin/psql/input.h +++ b/src/bin/psql/input.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.10 2000/04/12 17:16:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.11 2000/10/03 19:50:20 petere Exp $ */ #ifndef INPUT_H #define INPUT_H @@ -24,7 +24,7 @@ #endif #endif -#if defined(HAVE_LIBHISTORY) || (defined(HAVE_LIBREADLINE) && defined(HAVE_HISTORY_IN_READLINE)) +#if defined(HAVE_HISTORY_FUNCTIONS) #if defined(HAVE_READLINE_HISTORY_H) #include <readline/history.h> #define USE_HISTORY 1 diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 0e9cb2d3765..e7e329cfa8f 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.20 2000/06/25 14:25:51 petere Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.21 2000/10/03 19:50:20 petere Exp $ */ /*---------------------------------------------------------------------- @@ -60,7 +60,7 @@ #include "common.h" #include "settings.h" -#if defined(HAVE_FILENAME_COMPLETION_FUNCTION) && !defined(HAVE_FILENAME_COMPLETION_FUNCTION_DECL) +#ifndef HAVE_FILENAME_COMPLETION_FUNCTION_DECL char *filename_completion_function(char *, int); #endif @@ -699,17 +699,7 @@ psql_completion(char *text, int start, int end) strcmp(prev_wd, "\\w") == 0 || strcmp(prev_wd, "\\write") == 0 ) { -#ifdef HAVE_FILENAME_COMPLETION_FUNCTION matches = completion_matches(text, filename_completion_function); -#else - - /* - * This will probably have the same effect, but you never know - * what the heck some readline incarnation out there is going to - * do. - */ - matches = NULL; -#endif } |