[Bug 1c17fbba5d] Fix -errorinfo from syntax errors so that the error is
not obscured.  Instead highlight it by making it the last character quoted.
merge trunk; resolve conflicts; adapt [1c17fbba5d] fix