Merge pull request #1491 from mathstuf/elision-off-by-n

util: don't add ellipses width when deciding if they're necessary