Index: doc/src/sgml/ref/psql-ref.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v
retrieving revision 1.186
diff -c -c -r1.186 psql-ref.sgml
*** doc/src/sgml/ref/psql-ref.sgml	21 Feb 2007 23:22:42 -0000	1.186
--- doc/src/sgml/ref/psql-ref.sgml	23 Feb 2007 18:14:04 -0000
***************
*** 1430,1435 ****
--- 1430,1453 ----
        </varlistentry>
  
        <varlistentry>
+         <term><literal>\prompt [ <replaceable class="parameter">text</replaceable> ] <replaceable class="parameter">name</replaceable></literal></term>
+         <listitem>
+         <para>
+          Prompts the user to set variable <replaceable
+          class="parameter">name</>.  An optional prompt, <replaceable
+          class="parameter">text</>, can be specified.  (For multi-word
+          prompts, use single-quotes.)
+         </para>
+ 
+         <para>
+          By default, <literal>\prompt</> uses the terminal for input and
+          output.  However, if the <option>-f</> command line switch is
+          used, <literal>\prompt</> uses standard input and standard output.
+         </para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
          <term><literal>\pset <replaceable class="parameter">parameter</replaceable> [ <replaceable class="parameter">value</replaceable> ]</literal></term>
  
          <listitem>
Index: src/bin/psql/command.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/command.c,v
retrieving revision 1.177
diff -c -c -r1.177 command.c
*** src/bin/psql/command.c	5 Jan 2007 22:19:49 -0000	1.177
--- src/bin/psql/command.c	23 Feb 2007 18:14:06 -0000
***************
*** 712,717 ****
--- 712,768 ----
  		free(pw2);
  	}
  
+ 	/* \prompt -- prompt and set variable */
+ 	else if (strcmp(cmd, "prompt") == 0)
+ 	{
+ 		char	   *opt, *prompt_text = NULL;
+ 		char	   *arg1, *arg2;
+ 
+ 		arg1 = psql_scan_slash_option(scan_state, OT_NORMAL, NULL, false);
+ 		arg2 = psql_scan_slash_option(scan_state, OT_NORMAL, NULL, false);
+ 
+ 		if (!arg1)
+ 		{
+ 			psql_error("\\%s: missing required argument\n", cmd);
+ 			success = false;
+ 		}
+ 		else
+ 		{
+  			char	   *result;
+ 
+ 			if (arg2)
+ 			{
+ 				prompt_text = arg1;
+ 				opt = arg2;
+ 			}
+ 			else
+ 				opt = arg1;
+ 
+ 			if (!pset.inputfile)
+ 				result = simple_prompt(prompt_text, 4096, true);
+ 			else
+ 			{
+ 				if (prompt_text)
+ 				{
+ 					fputs(prompt_text, stdout);
+ 					fflush(stdout);
+ 				}
+ 				result = gets_fromFile(stdin);
+ 			}
+ 
+ 			if (!SetVariable(pset.vars, opt, result))
+ 			{
+ 				psql_error("\\%s: error\n", cmd);
+ 				success = false;
+ 			}
+ 
+ 			free(result);
+ 			if (prompt_text)
+ 				free(prompt_text);
+ 			free(opt);
+ 		}
+ 	}
+ 
  	/* \pset -- set printing parameters */
  	else if (strcmp(cmd, "pset") == 0)
  	{
Index: src/bin/psql/help.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/help.c,v
retrieving revision 1.116
diff -c -c -r1.116 help.c
*** src/bin/psql/help.c	5 Jan 2007 22:19:49 -0000	1.116
--- src/bin/psql/help.c	23 Feb 2007 18:14:06 -0000
***************
*** 161,167 ****
  {
  	FILE	   *output;
  
! 	output = PageOutput(67, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
--- 161,167 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(69, pager);
  
  	/* if you add/remove a line here, change the row count above */
  
***************
*** 184,189 ****
--- 184,191 ----
  	fprintf(output, _("  \\timing        toggle timing of commands (currently %s)\n"),
  			ON(pset.timing));
  	fprintf(output, _("  \\unset NAME    unset (delete) internal variable\n"));
+ 	fprintf(output, _("  \\prompt [TEXT] NAME\n"
+ 					  "                 prompt user to set internal variable\n"));
  	fprintf(output, _("  \\! [COMMAND]   execute command in shell or start interactive shell\n"));
  	fprintf(output, "\n");
  
Index: src/bin/psql/tab-complete.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v
retrieving revision 1.158
diff -c -c -r1.158 tab-complete.c
*** src/bin/psql/tab-complete.c	7 Feb 2007 00:52:35 -0000	1.158
--- src/bin/psql/tab-complete.c	23 Feb 2007 18:14:07 -0000
***************
*** 542,548 ****
  		"\\e", "\\echo", "\\encoding",
  		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
! 		"\\o", "\\p", "\\password", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\t", "\\T",
  		"\\timing", "\\unset", "\\x", "\\w", "\\z", "\\!", NULL
  	};
--- 542,548 ----
  		"\\e", "\\echo", "\\encoding",
  		"\\f", "\\g", "\\h", "\\help", "\\H", "\\i", "\\l",
  		"\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
! 		"\\o", "\\p", "\\password", "\\prompt", "\\pset", "\\q", "\\qecho", "\\r",
  		"\\set", "\\t", "\\T",
  		"\\timing", "\\unset", "\\x", "\\w", "\\z", "\\!", NULL
  	};