X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/6f6c364942a7bb9c46feb38dc4bdc86d67dc9395..4120b2c6117642e02113e576a573bf8d60ec4c72:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 40280de..f1bcfbf 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -222,6 +222,8 @@
 				     "\\)")
 			     addr)
 	       (concat "submit@bugs." (match-string 1 addr)))
+	      ((string-match "^\\([^@+]+\\)\\+[^@]*\\(@.*\\)$" addr)
+	       (concat (match-string 1 addr) (match-string 2 addr)))
 	      (t addr))))
 
 ;; Customization.
@@ -493,7 +495,8 @@
 
 ;; Default frame size.
 
-(setq default-frame-alist
+(setq frame-background-mode (if mdw-black-background 'dark 'light)
+      default-frame-alist
       `((width . ,(if (>= emacs-major-version 21) 77 78))
 	(height . 33)
 	(vertical-scroll-bars . right)
@@ -505,7 +508,7 @@
 	(tool-bar-lines . 0)
 	(menu-bar-lines . 1)
 	(cursor-color . "red")
-	(background-mode . ,(if mdw-black-background 'dark 'light)))
+	(background-mode . ,frame-background-mode))
       initial-frame-alist
       `((width . ,(if (>= emacs-major-version 21) 77 78))
 	(menu-bar-lines . ,(if window-system 1 0)))
@@ -551,7 +554,7 @@
   (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
   (global-set-key [?\M-#] 'calc-dispatch)
   (global-set-key [?\C-x ?/] 'auto-fill-mode)
-  (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window)
+  (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
   (global-set-key [insertchar] 'overwrite-mode)
   (global-set-key [?\C-x ?\C-n] 'skel-create-file)
   (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window)