dot/emacs: Add key bindings for VM.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 7f876e7..13d142c 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -201,7 +201,7 @@
 
 (setq mail-user-agent 'message-user-agent
       read-mail-command 'gnus)
-(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
+(setq message-signature-separator "^-- \\(\\[mdw\\]\\)?$"
       message-yank-prefix "> "
       message-yank-cited-prefix "> "
       message-send-mail-function 'message-send-mail-with-sendmail
@@ -233,19 +233,25 @@
       (lambda ()
        (let ((group gnus-newsgroup-name))
          (and (string-match "^nn\\(imap\\|folder\\)\\+" group)
-              (not (string-match ":\\(crap\\|spam\\|lists\\|corpus\\)\\."
+              (not (string-match (concat ":" "\\(" "\\(" "crap"
+                                                   "\\|" "spam"
+                                                   "\\|" "lists"
+                                                   "\\|" "corpus"
+                                                   "\\)" "\\."
+                                             "\\|" "Junk Email$"
+                                             "\\)")
                                  group)))))
       bbdb-user-mail-names
       (concat "^"
              "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
-                   "\\([-+][^@]*\\|\\)"
+                   "\\([-+][^@]*\\)?"
                    "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
              "\\|" "\\(" "\\(mdw\\|mwooding\\)"
                          "\\(\\+[^@]*\\)?"
                    "\\|" "0" "\\(mdw\\|mwooding\\)" "k\\.[^@]*"
                    "\\)" "@"
                    "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
-             "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
+             "\\|" "distorted\\.mdw@g\\(oogle\\)?mail.com"
              "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
              "\\|" "mark\\.wooding@trustonic\\.com"
              "\\)$")
@@ -421,6 +427,10 @@
      (define-key outline-mode-prefix-map [?\C-r] 'reveal-mode)
      (define-key outline-mode-prefix-map [?\C--] 'mdw-outline-collapse-all)))
 
+(define-key isearch-mode-map [?\C-?] 'isearch-del-char)
+(define-key isearch-mode-map [backspace] 'isearch-del-char)
+(define-key isearch-mode-map [?\e ?\C-?] 'isearch-delete-char)
+
 (setq imenu-auto-rescan t
       imenu-auto-rescan-maxout (* 128 1024)
       imenu-max-items 60)
@@ -699,6 +709,8 @@
   (global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
   (global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here)
   (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
+  (global-set-key [?\C-c ?v ?i] 'vm-visit-imap-folder)
+  (global-set-key [?\C-c ?v ?m] 'vm-visit-folder)
   (global-set-key [?\C-c ?v ?v] 'mdw-auto-revert)
   (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
   (global-set-key [?\C-c ?w ?h] 'windmove-left)
@@ -881,9 +893,9 @@
                             ((executable-find "sudo") "sudo")
                             (t "su")))
           (this-host (concat "\\`\\(localhost\\|"
-                             (system-name) "\\|\\)\\'"))
+                             (system-name) "\\)?\\'"))
           (this-user (concat "\\`\\(" (user-login-name) "\\|"
-                             (user-real-login-name) "\\|\\)\\'")))
+                             (user-real-login-name) "\\)?\\'")))
        (setq tramp-default-method-alist
             `((,this-host nil ,rootlyness)
               (nil ,this-user "ssh")
@@ -928,7 +940,7 @@
 (setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
-             "[Pp]assword\\|[Pp]ass ?phrase\\(\\| [-a-zA-Z0-9._]+\\)\\):")
+             "[Pp]assword\\|[Pp]ass ?phrase\\( [-a-zA-Z0-9._]+\\)?\\):")
       comint-file-name-chars "~/A-Za-z0-9+@:_.$#%,={}-"
       shell-file-name-chars comint-file-name-chars)