X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/726eec9cefda82ce4f40c5daa2c85abbac7b970b..60abf0c5588242a83f7f9c87940996727fef5f2c:/dot/emacs?ds=inline

diff --git a/dot/emacs b/dot/emacs
index 2ab16ad..757306b 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -602,6 +602,15 @@
   (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)
@@ -744,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)
@@ -817,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)