Current trunk has issues to do proper line arrangements immediately; I
noticed the problem viewing Info pages and during query-replace.  Here
is the query-replace example: