X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/772a7a3be0f3d56dc8f416c50ff91af40949720a..c2c256b7c6b49be7c2084ba6028539f3f8640684:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 3de2694..e269086 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)))
@@ -313,7 +322,16 @@
 (setq next-line-add-newlines nil)	;Don't add weird newlines
 (setq split-height-threshold nil)	;Reuse windows where sensible
 (setq display-buffer-reuse-frames nil	;Don't confuse me by showing buffers
-      iswitchb-default-method 'samewindow) ;in other random frames
+      iswitchb-default-method 'samewindow ;in other random frames
+      ido-default-file-method 'selected-window
+      ido-default-buffer-method 'selected-window)
+(setq ido-enable-flex-matching t
+      ido-everywhere t
+      ido-confirm-unique-completion t
+      ido-use-filename-at-point nil
+      ido-auto-merge-work-directories-length -1)
+(setq pcomplete-cycle-completions nil	;Who thought that was a good idea?
+      eshell-cmpl-cycle-completions nil)
 (setq dired-deletion-confirmer		;Make deletion easier in dired
       (symbol-function 'y-or-n-p)
       dired-listing-switches "-alF"	;Do `ls -F' things in dired windows
@@ -321,12 +339,15 @@
 (setq read-quoted-char-radix 16)	;C-q HEX-STUFF [RET]
 (setq case-fold-file-names nil)		;Don't translate file names (grr...)
 (setq scroll-step 5)			;Don't scroll too much at a time
+(setq blink-cursor-blinks 0)		;Keep blinking the cursor
 (setq-default fill-column mdw-text-width) ;I use rather narrow windows
+(setq reb-re-syntax 'string)		;Enough backslashes even with this
 (setq-default comment-column 40)	;Set a standard comment column
 (setq-default truncate-partial-width-windows nil
 	      truncate-lines t)
 (setq default-indicate-empty-lines t)
 (setq view-read-only t)
+(setq-default view-exit-action #'kill-buffer)
 (setq whitespace-style '(trailing empty indentation face lines-tail
 			 space-before-tab space-after-tab)
       whitespace-line-column mdw-text-width)
@@ -581,8 +602,26 @@
 (trap
   (windmove-default-keybindings))
 (setq windmove-wrap-around t)
-(trap (iswitchb-mode))
+(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)
   (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit)
   (global-set-key [?\C-c ?w left] 'windmove-left)
@@ -599,14 +638,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 ?k] 'compile)
+  (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 ?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)
@@ -647,6 +699,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)))