Commit1713a00

committed

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

The width of the invisible PROMPT2 must take into account, in orderfor user input to be aligned with the first line, that PROMPT1 cancontain newlines.Author: Maxence AhloucheReviewed-by: Tom LaneDiscussion:https://postgr.es/m/CAJeaomVyLSP_Wj%3D0FtYNTuoopWHyFarhUtYKDHs0HHv%2Bb%3DN9sA%40mail.gmail.com

1 parentc185a57 commit1713a00Copy full SHA for 1713a00

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,10 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)`
`373`	`373`	`if (visible)`
`374`	`374`	`{`
`375`	`375`	`chwidth=PQdsplen(p,pset.encoding);`
`376`		`-if (chwidth>0)`
	`376`	`+`
	`377`	`+if (*p=='\n')`
	`378`	`+last_prompt1_width=0;`
	`379`	`+elseif (chwidth>0)`
`377`	`380`	`last_prompt1_width+=chwidth;`
`378`	`381`	`}`
`379`	`382`

Comments

(0)