Merge commit 'crybaby/master'; commit 'ponder/master'

[profile] / emacs

diff --git a/emacs b/emacs
index ba6c4421405c366b52a0043b74c8ccc3d2ba613d..4337d391d09d8b9b4893afd30f2ffcd4c6279717 100644 (file)
--- a/emacs
+++ b/emacs
@@ -121,6 +121,18 @@
 (setq sendmail-program "~/bin/sendmail-hack")
 
 (setq mail-user-agent 'message-user-agent)
+(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
+      message-yank-prefix "> "
+      message-yank-cited-prefix "> "
+      message-indent-citation-function '(message-indent-citation
+                                        mdw-trim-spaces-after-citing))
+
+(defun mdw-trim-spaces-after-citing ()
+  (save-excursion
+    (save-restriction
+      (narrow-to-region (point) (mark t))
+      (while (re-search-forward "^> +$" nil t)
+       (replace-match ">")))))
 
 (and (fboundp 'turn-on-gnus-dired-mode)
      (not mdw-fast-startup)