X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/4aba12fa4cbe02596d77f9437af4f6505c19745d..94639d60bdc5446f8c530c54234fb7811e47da74:/dot/emacs?ds=sidebyside

diff --git a/dot/emacs b/dot/emacs
index bc89bfd..6cf5b6e 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -608,19 +608,27 @@
   (global-set-key [?\C-c ?t ?i] 'timeclock-in)
   (global-set-key [?\C-c ?t ?c] 'timeclock-change)
   (global-set-key [?\C-c ?t ?o] 'timeclock-out)
-  (global-set-key [?\C-c ?t ?r] 'timeclock-reread-log)
+  (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 ?m ?b] 'magit-blame)
   (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause)
   (global-set-key [?\C-c ?p ?s] 'mdw-mpc-stop)
   (global-set-key [?\C-c ?p ?<] 'mdw-mpc-prev)
   (global-set-key [?\C-c ?p ?>] 'mdw-mpc-next)
+  (global-set-key [?\C-c ?p ?+] 'mdw-mpc-louder)
+  (global-set-key [?\C-c ?p ?-] 'mdw-mpc-quieter)
   (global-set-key [?\C-c ?p ??] 'mdw-mpc-now-playing)
-  (global-set-key [?\C-c ?k] 'compile)
+  (global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here)
+  (global-set-key [?\C-c ?t ?.] 'gtags-find-tag)
+  (global-set-key [?\C-c ?t ?r] 'gtags-find-rtag)
+  (global-set-key [?\C-c ?t ?4 ?.] 'gtags-find-tag-other-window)
+  (global-set-key [?\C-c ?t ?,] 'gtags-pop-stack)
+  (global-set-key [?\C-c ?k] 'mdw-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)
@@ -661,6 +669,8 @@
      (trap (require 'dired-x))
      (and (fboundp 'dired-do-relsymlink)
 	  (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink))))
+(setq dired-guess-shell-alist-user
+      '(("\\.pdf\\'" "mupdf")))
 
 (add-hook 'org-mode-hook
 	  #'(lambda () (mdw-clobber-evil-keymap org-mode-map)))