Change transaction status indicator in prompt from %T to %x.

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 784cc06a414c88a72dd01928d6c1cdaa6850b3d2..af8c2c5fc3466862b90491a1827eb18861de8f87 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.97 2003/09/12 02:40:09 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.98 2003/10/04 01:04:46 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -2254,7 +2254,7 @@ testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\'
       </varlistentry>
 
       <varlistentry>
-        <term><literal>%T</literal></term>
+        <term><literal>%x</literal></term>
        <listitem>
        <para>
        Transaction status: an empty string when not in a transaction

diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index fbc0f44381f11c7449939acc6044612e51dddd83..18f4b1aac439ee153336b68f9418ad0d08c02256 100644 (file)
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.29 2003/09/03 22:05:09 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.30 2003/10/04 01:04:46 petere Exp $
  */
 #include "postgres_fe.h"
 #include "prompt.h"
@@ -44,7 +44,7 @@
  *                     or a ! if session is not connected to a database;
  *             in prompt2 -, *, ', or ";
  *             in prompt3 nothing
- * %T - transaction status: empty, *, !, ? (unknown or no connection)
+ * %x - transaction status: empty, *, !, ? (unknown or no connection)
  * %? - the error code of the last query (not yet implemented)
  * %% - a percent sign
  *
@@ -208,7 +208,7 @@ get_prompt(promptStatus_t status)
                                        }
                                        break;
 
-                               case 'T':
+                               case 'x':
                                        if (!pset.db)
                                                buf[0] = '?';
                                        else