X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/0697e3b7fb4db9dde7276e7d65f42011c66ed35a..a5807b1e0acdb7427fc14f24ddf0f040cc8b7b28:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 2e15651..7208737 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -46,6 +46,11 @@
 
 ;; Load some other bits of code.
 
+;; Magic to make ELPA packages work.
+(trap
+(package-initialize)
+)
+
 (maybe-autoload 'cc-mode "cc-mode" nil t)
 (maybe-autoload 'rexx-mode "rexx-mode" nil t)
 (maybe-autoload 'cvs-update "pcl-cvs" nil t)
@@ -384,6 +389,7 @@
 (setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
 (setq password-cache-expiry nil)
+(setq mouse-autoselect-window t)
 (setq-default proced-filter 'all
 	      proced-sort 'user)
 (setq ispell-program-name "aspell-hack"
@@ -415,6 +421,9 @@
      (define-key outline-mode-prefix-map [?\C-r] 'reveal-mode)
      (define-key outline-mode-prefix-map [?\C--] 'mdw-outline-collapse-all)))
 
+(define-key isearch-mode-map [?\C-?] 'isearch-del-char)
+(define-key isearch-mode-map [?\e ?\C-?] 'isearch-delete-char)
+
 (setq imenu-auto-rescan t
       imenu-auto-rescan-maxout (* 128 1024)
       imenu-max-items 60)
@@ -662,8 +671,8 @@
   (global-set-key [?\e ?\e] 'mdw-wrong)
   (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit)
   (global-set-key [?\C-c ?\M-x] 'execute-extended-command)
-  (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
   (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
+  (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
   (global-set-key [?\C-c ?g ?a] 'org-agenda)
   (global-set-key [?\C-c ?g ?b] 'org-iswitchb)
   (global-set-key [?\C-c ?g ?l] 'org-store-link)
@@ -705,6 +714,9 @@
   (global-set-key [?\C-c ?w left] 'windmove-left)
   (global-set-key [?\C-c ?w right] 'windmove-right)
   (global-set-key [?\C-h ?\C-m] 'manual-entry)
+  (global-set-key [?\C-x ?4 ?\C-j] 'dired-jump-other-window)
+  (global-set-key [?\C-x ?4 ?j] 'dired-jump-other-window)
+  (global-set-key [?\C-x ?\C-j] 'dired-jump)
   (global-set-key [?\C-x ?\C-n] 'skel-create-file)
   (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window)
   (global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame)
@@ -733,6 +745,9 @@
 				   try-expand-list-all-buffers)))
 		    hippie-expand-try-functions-list)))
 
+(autoload 'dired-jump "dired-x")
+(autoload 'dired-jump-other-window "dired-x")
+
 (eval-after-load "dired"
   '(progn
      (or (lookup-key dired-mode-map  [?\C-x ?\C-q])