X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5147578f0296360f237bd78adbb856f287037123..129a1a0c99dbc61c2b3c02c1d5c388574082820b:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index f98a566..3dc860a 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -279,6 +279,15 @@
     (apply #'set-input-mode
 	   (nconc (list (nth 0 im) (nth 1 im) 0) (nthcdr 3 im)))))
 
+;; Some unpleasant terminal hackery.  Screen prefixes the current terminal
+;; name with `screen.', and Emacs is too dim to split the name at the `.'.
+;; Help it out.
+
+(defun terminal-init-screen.xterm ()
+  (tty-run-terminal-initialization (selected-frame) "screen"))
+(defun terminal-init-screen.putty ()
+  (tty-run-terminal-initialization (selected-frame) "screen"))
+
 ;; Don't disable any commands.
 
 (mapatoms #'(lambda (sym) (put sym 'disabled nil)))
@@ -588,8 +597,22 @@
 (setq windmove-wrap-around t)
 (trap (require 'ido) (ido-mode 1)
       (require 'ido-ubiquitous) (ido-ubiquitous-mode 1)
+      (setq ido-cr+-max-items nil
+	    ido-ubiquitous-command-overrides
+	    (append ido-ubiquitous-command-overrides
+		    `((enable-old regexp ,(concat "\\`"
+						  "gtags-find-"
+						  "\\("    "tag"
+							"\\|file"
+							"\\|rtag"
+							"\\|symbol"
+						  "\\)"
+						  "\\("	"\\|-other-window"
+						  "\\)"
+						  "\\'")))))
       (setq magit-completing-read-function 'magit-ido-completing-read)
       (require 'smex) (smex-initialize) (global-set-key [?\M-x] 'smex))
+
 (progn
   (global-set-key [?\C-c ?\M-x] 'execute-extended-command)
   (global-set-key [?\e ?\e] 'mdw-wrong)
@@ -608,13 +631,14 @@
   (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)
@@ -622,6 +646,11 @@
   (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 ?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)