diff options
| author | Bruce Momjian | 2003-02-19 04:04:04 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2003-02-19 04:04:04 +0000 |
| commit | adc3b34b9cc8a5aff7dd1cc9d249708490301ccb (patch) | |
| tree | d49ee42828b0e2b86f673a390c3badee201f94c9 /src/bin | |
| parent | d0f3a7e9c453b10ad3c16a780858dd2621fc184a (diff) | |
Here's the patch I promised over on HACKERS - it alters the
implementation
of '\e' history tracking for systems that have a readline compatability
library without replace_history_entry. I fall back to pushing the query
onto the history stack after the \e, rather than replacing it.
The patch adds one more place to look for readline headers, and a test
for replace_history_entry. I've only included the patch for configure.in
Ross J. Reedstrom
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/psql/command.c | 7 | ||||
| -rw-r--r-- | src/bin/psql/input.h | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 5b727b06bd..0019755c0a 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -3,7 +3,7 @@ * * Copyright 2000-2002 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.89 2003/02/13 04:08:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.90 2003/02/19 04:04:04 momjian Exp $ */ #include "postgres_fe.h" #include "command.h" @@ -1649,7 +1649,12 @@ do_edit(const char *filename_arg, PQExpBuffer query_buf) } #ifdef USE_READLINE +#ifdef HAVE_REPLACE_HISTORY_ENTRY + replace_history_entry(where_history(),query_buf->data,NULL); +#else + add_history(query_buf->data); +#endif #endif fclose(stream); } diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h index fbb52f20da..4ed51f59ca 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.17 2002/09/04 20:31:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.18 2003/02/19 04:04:04 momjian Exp $ */ #ifndef INPUT_H #define INPUT_H @@ -18,11 +18,15 @@ #define USE_READLINE 1 #if defined(HAVE_READLINE_READLINE_H) #include <readline/readline.h> +#elif defined(HAVE_EDITLINE_READLINE_H) +#include <editline/readline.h> #elif defined(HAVE_READLINE_H) #include <readline.h> #endif #if defined(HAVE_READLINE_HISTORY_H) #include <readline/history.h> +#elif defined(HAVE_EDITLINE_HISTORY_H) +#include <editline/history.h> #elif defined(HAVE_HISTORY_H) #include <history.h> #endif |