Merge commit 'ponder/master'

* commit 'ponder/master':
  emacs: Make M-/ do hippie-expand -- if not starting up quickly.
  emacs: Enable semantic hackery if we're not meant to start quickly.

diff --cc emacs
Simple merge