summaryrefslogtreecommitdiff
path: root/src/bin/psql/common.c
diff options
context:
space:
mode:
authorBruce Momjian2002-11-08 19:12:21 +0000
committerBruce Momjian2002-11-08 19:12:21 +0000
commitb26dfbb0e3204c170e7928b7156521fa18b744bf (patch)
treec2d9c9cad2ac87267cd2af6936a43797c2b2e32d /src/bin/psql/common.c
parentc2b716ab6834b40a6ff6e807b7c5344da224fa6e (diff)
Here is a patch that does just that, while maintaining the
"traditional" behavior, so the change should be transparent. Use the command "\pset pager always" to turn it on. Anything else does the normal toggle between "on" and "off" Greg Sabino Mullane
Diffstat (limited to 'src/bin/psql/common.c')
-rw-r--r--src/bin/psql/common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 55af65a3ae1..fcd898877a2 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.51 2002/10/29 19:35:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.52 2002/11/08 19:12:21 momjian Exp $
*/
#include "postgres_fe.h"
#include "common.h"
@@ -548,7 +548,7 @@ PageOutput(int lines, bool pager)
struct winsize screen_size;
result = ioctl(fileno(stdout), TIOCGWINSZ, &screen_size);
- if (result == -1 || lines > screen_size.ws_row)
+ if (result == -1 || lines > screen_size.ws_row || pager > 1)
{
#endif
pagerprog = getenv("PAGER");