X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ee7c3dea8fe987cd50c99f82b168db1de6db4cd7..294db17fa591258f1112f56976a6facf87b81c17:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 4e28726..1e46f34 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -86,6 +86,13 @@
 (trap (show-paren-mode t))
 (or window-system (menu-bar-mode -1))
 
+;; Multiple cursors.
+
+(setq load-path (nconc load-path (list "~/lib/emacs/multiple-cursors/")))
+(global-set-key [?\C-c ?r] 'mdw-multiple-cursors-keymap)
+(autoload 'mdw-multiple-cursors-keymap "mdw-multiple-cursors.el"
+  "A keymap for Magnar Sveen's awesome multiple-cursors." nil 'keymap)
+
 ;; Temporary directory handling.
 
 (defun mdw-check-dir-exists (dir)
@@ -410,7 +417,7 @@
 
 (setq default-frame-alist
       (mdw-uniquify-alist
-       '((width . 78)
+       `((width . ,(if (>= emacs-major-version 21) 77 78))
 	 (height . 33)
 	 (vertical-scroll-bars . right)
 	 (cursor-type . bar)
@@ -418,10 +425,8 @@
 	 (left-fringe . 5)
 	 (right-fringe . 5)
 	 (scroll-bar-width . 15)
-	 (cursor-color . "red"))
-       (if mdw-black-background
-	   '((background-mode . dark))
-	 '((background-mode . light)))))
+	 (cursor-color . "red")
+	 (background-mode . ,(if mdw-black-background 'dark 'light)))))
 (setq window-system-default-frame-alist
       '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
 	    (menu-font . "8.Helv")
@@ -496,7 +501,7 @@
 (or mdw-fast-startup
     (trap (progn
 	    (org-remember-insinuate)
-	    (global-set-key [?\C-c ?r] 'org-remember))))
+	    (global-set-key [?\C-c ?o ?r] 'org-remember))))
 
 ;; Minor mode listing