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 --git a/emacs b/emacs
index 6e9201a7e7c2633842479340a4a9697c95e8f646..dcb561d4c6fcaa2676b8ef5dc5334a0da476972a 100644 (file)
--- a/emacs
+++ b/emacs
@@ -121,6 +121,7 @@
 (setq sendmail-program "~/bin/sendmail-hack")
 
 (setq mail-user-agent 'message-user-agent)
+(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$")
 
 (and (fboundp 'turn-on-gnus-dired-mode)
      (not mdw-fast-startup)