Commit 1713a001 authored by Thomas Munro's avatar Thomas Munro

psql: Fix %w length in PROMPT2 when PROMPT1 contains a newline.

The width of the invisible PROMPT2 must take into account, in order
for user input to be aligned with the first line, that PROMPT1 can
contain newlines.

Author: Maxence Ahlouche
Reviewed-by: Tom Lane
Discussion: https://postgr.es/m/CAJeaomVyLSP_Wj%3D0FtYNTuoopWHyFarhUtYKDHs0HHv%2Bb%3DN9sA%40mail.gmail.com
parent c185a577
......@@ -373,7 +373,10 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)
if (visible)
{
chwidth = PQdsplen(p, pset.encoding);
if (chwidth > 0)
if (*p == '\n')
last_prompt1_width = 0;
else if (chwidth > 0)
last_prompt1_width += chwidth;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment