Merge code from lazycatdepend and init-misc.el