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

diff --git a/dot/emacs b/dot/emacs
index 757306b..352eb8a 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -313,7 +313,12 @@
 (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-confirm-unique-completion t
+      ido-use-filename-at-point 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
@@ -581,8 +586,12 @@
 (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 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)
@@ -607,11 +616,11 @@
   (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 ?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-now-playing)
-  (global-set-key [?\C-c ?k] 'compile)
+  (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)
@@ -652,6 +661,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)))