bug#27427: 26.0.50; Native line numbers lead to display error in company-mode popup

[martin rudalics]

> Are the rearrangements necessary, or just out of aesthetic feelings?

Neither.  They were part of the attempt to faithfully restore the state
before that variable was introduced.

> If the latter, I'd prefer not to rearrange, as that makes forensics a
> tad harder.

We violently agree.

> Otherwise, fine with me; please push.

Done.

martin