Merge remote-tracking branches 'spirit', 'crybaby' and 'staging'

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 8839993..370cfee 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -733,6 +733,8 @@
   (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 ?b] 'w3m-bookmark-view)
+  (global-set-key [?\C-c ?w ?c] 'mdw-set-frame-colour)
   (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
   (global-set-key [?\C-c ?w ?h] 'windmove-left)
   (global-set-key [?\C-c ?w ?j] 'windmove-down)