X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/48bfbb038a527bfe31dd29b7656193bbe4186ea3..0f81a1314ae8d217805a705a74e425f63b513f9b:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index ce99762..757306b 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -97,6 +97,9 @@
 (require 'paren)
 (trap (show-paren-mode t))
 (or window-system (mdw-emacs-version-p 22) (menu-bar-mode -1))
+(setq x-select-enable-clipboard nil
+      x-select-enable-primary t
+      mouse-drag-copy-region t)
 
 ;; Multiple cursors.
 
@@ -134,6 +137,11 @@
 		      (and edit
 			   (set-process-query-on-exit-flag edit nil)))))))
 
+;; Saving state.
+
+(or mdw-fast-startup (savehist-mode 1))
+(setq history-length 200)
+
 ;; Control backup behaviour.
 
 (setq backup-by-copying nil)
@@ -208,7 +216,8 @@
       (lambda ()
 	(let ((group gnus-newsgroup-name))
 	  (and (string-match "^nn\\(imap\\|folder\\)\\+" group)
-	       (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group)))))
+	       (not (string-match ":\\(crap\\|spam\\|lists\\|corpus\\)\\."
+				  group)))))
       bbdb-user-mail-names
       (concat "^"
 	      "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
@@ -593,6 +602,16 @@
   (global-set-key [?\C-c ?t ?r] 'timeclock-reread-log)
   (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
   (global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
+  (global-set-key [?\C-c ?m ?m] 'magit-status)
+  (global-set-key [?\C-c ?m ?d] 'magit-dispatch-popup)
+  (global-set-key [?\C-c ?m ?w] 'magit-wip-log)
+  (global-set-key [?\C-c ?m ?r] 'magit-list-repositories)
+  (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause)
+  (global-set-key [?\C-c ?p ?s] 'mpc-stop)
+  (global-set-key [?\C-c ?p ?<] 'mpc-prev)
+  (global-set-key [?\C-c ?p ?>] 'mpc-next)
+  (global-set-key [?\C-c ?p ??] 'mdw-mpc-now-playing)
+  (global-set-key [?\C-c ?k] 'compile)
   (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
   (global-set-key [?\M-#] 'calc-dispatch)
   (global-set-key [?\C-x ?/] 'auto-fill-mode)
@@ -734,7 +753,7 @@
 	lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
 	inferior-lisp-mode-hook slime-repl-mode-hook
 	sml-mode-hook haskell-mode-hook erlang-mode-hook
-	smalltalk-mode-hook rexx-mode-hook
+	smalltalk-mode-hook rexx-mode-hook lua-mode-hook
 	arm-assembler-mode-hook))
 
 (global-font-lock-mode t)
@@ -807,6 +826,7 @@
   (add-hook 'go-mode-hook 'mdw-fontify-go t)
   (add-hook 'rust-mode-hook 'mdw-fontify-rust t)
 
+  (add-hook 'lua-mode-hook 'mdw-fontify-lua t)
   (add-hook 'icon-mode-hook 'mdw-fontify-icon t)
 
   (add-hook 'apcalc-mode-hook 'mdw-misc-mode-config t)