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

[profile] / emacs

diff --git a/emacs b/emacs
index dcb561d..4337d39 100644 (file)
--- a/emacs
+++ b/emacs
@@ -121,7 +121,18 @@
 (setq sendmail-program "~/bin/sendmail-hack")
 
 (setq mail-user-agent 'message-user-agent)
-(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$")
+(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)
@@ -290,6 +301,10 @@
 (setq appt-display-interval 3)
 (setq appt-message-warning-time 10)
 
+;; --- Org-mode agenda ---
+
+(setq org-agenda-include-diary t)
+
 ;; --- Cosmetic stuff ---
 
 (setq display-time-24hr-format t)
@@ -376,6 +391,7 @@
 (global-set-key [?\C-x ?w ?l] 'windmove-right)
 (global-set-key [?\C-x ?g ?l] 'org-store-link)
 (global-set-key [?\C-x ?g ?a] 'org-agenda)
+(global-set-key [?\C-x ?g ?b] 'org-iswitchb)
 (global-set-key [?\C-x ?t ?i] 'timeclock-in)
 (global-set-key [?\C-x ?t ?c] 'timeclock-change)
 (global-set-key [?\C-x ?t ?o] 'timeclock-out)
@@ -403,20 +419,10 @@
 (and (not mdw-fast-startup) (fboundp 'hippie-expand)
      (global-set-key [?\M-/] 'hippie-expand))
 
-(defun mdw-clobber-org-mode-map ()
-  (dolist (key '([S-up] [S-down] [S-left] [S-right]
-                [?\e left] [?\e right]
-                [M-left] [M-right]))
-    (define-key org-mode-map key nil))
-  (define-key org-mode-map [?\C-c left] 'org-shiftleft)
-  (define-key org-mode-map [?\C-c right] 'org-shiftright)
-  (define-key org-mode-map [?\C-c up] 'org-shiftup)
-  (define-key org-mode-map [?\C-c down] 'org-shiftdown)
-  (define-key org-mode-map [C-left] 'org-metaleft)
-  (define-key org-mode-map [C-right] 'org-metaright)
-  (define-key org-mode-map [C-up] 'org-metaup)
-  (define-key org-mode-map [C-down] 'org-metadown))
-(add-hook 'org-mode-hook 'mdw-clobber-org-mode-map)
+(add-hook 'org-mode-hook
+         #'(lambda () (mdw-clobber-evil-keymap org-mode-map)))
+(add-hook 'org-agenda-mode-hook
+         #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))
 
 ;; --- Recognising types of files ---