diff options
author | Tom Lane | 2017-09-05 16:02:06 +0000 |
---|---|---|
committer | Tom Lane | 2017-09-05 16:02:13 +0000 |
commit | 5e8304fdce2d5c41ef7a648ed0a622480f8f0a07 (patch) | |
tree | bc6729d626efd6e1ba9bda47a2e518fa49d97259 /doc/src | |
parent | ebd346caf41b8e8738a49d96797ceccd04bb04dc (diff) |
In psql, use PSQL_PAGER in preference to PAGER, if it's set.
This allows the user's environment to set up a psql-specific choice
of pager, in much the same way that we provide PSQL_EDITOR to allow
a psql-specific override of the more widely known EDITOR variable.
Pavel Stehule, reviewed by Thomas Munro
Discussion: https://postgr.es/m/CAFj8pRD3RRk9S1eRbnGm_T6brc3Ss5mohraNzTSJquzx+pmtKA@mail.gmail.com
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/sgml/ref/psql-ref.sgml | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 868de184184..fd2ca15d0aa 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -2665,10 +2665,10 @@ lo_import 152801 <listitem> <para> Controls use of a pager program for query and <application>psql</> - help output. If the environment variable <envar>PAGER</envar> - is set, the output is piped to the specified program. - Otherwise a platform-dependent default (such as - <filename>more</filename>) is used. + help output. If the environment variable <envar>PSQL_PAGER</envar> + or <envar>PAGER</envar> is set, the output is piped to the + specified program. Otherwise a platform-dependent default program + (such as <filename>more</filename>) is used. </para> <para> @@ -4107,21 +4107,6 @@ $endif </varlistentry> <varlistentry> - <term><envar>PAGER</envar></term> - - <listitem> - <para> - If the query results do not fit on the screen, they are piped - through this command. Typical values are - <literal>more</literal> or <literal>less</literal>. The default - is platform-dependent. Use of the pager can be disabled by setting - <envar>PAGER</envar> to empty, or by using pager-related options of - the <command>\pset</command> command. - </para> - </listitem> - </varlistentry> - - <varlistentry> <term><envar>PGDATABASE</envar></term> <term><envar>PGHOST</envar></term> <term><envar>PGPORT</envar></term> @@ -4145,11 +4130,8 @@ $endif and <command>\ev</command> commands. These variables are examined in the order listed; the first that is set is used. - </para> - - <para> - The built-in default editors are <filename>vi</filename> on Unix - systems and <filename>notepad.exe</filename> on Windows systems. + If none of them is set, the default is to use <filename>vi</filename> + on Unix systems or <filename>notepad.exe</filename> on Windows systems. </para> </listitem> </varlistentry> @@ -4193,6 +4175,27 @@ PSQL_EDITOR_LINENUMBER_ARG='--line ' </varlistentry> <varlistentry> + <term><envar>PSQL_PAGER</envar></term> + <term><envar>PAGER</envar></term> + + <listitem> + <para> + If a query's results do not fit on the screen, they are piped + through this command. Typical values are <literal>more</literal> + or <literal>less</literal>. + Use of the pager can be disabled by setting <envar>PSQL_PAGER</envar> + or <envar>PAGER</envar> to an empty string, or by adjusting the + pager-related options of the <command>\pset</command> command. + These variables are examined in the order listed; + the first that is set is used. + If none of them is set, the default is to use <literal>more</> on most + platforms, but <literal>less</> on Cygwin. + </para> + + </listitem> + </varlistentry> + + <varlistentry> <term><envar>PSQLRC</envar></term> <listitem> |