column-fill-indicator
Merge branch 'master' of github.com:ddysher/emacs