hl-line.
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	soft-charcoal-theme.el