X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5d98dbf6b73b0348572aa811936081e9c24c7d38..6dc106123aa94d1bbf790dd9edd808fa9bb808a7:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index f2f7b73..22da44c 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)
@@ -228,7 +233,11 @@
       (lambda ()
 	(let ((group gnus-newsgroup-name))
 	  (and (string-match "^nn\\(imap\\|folder\\)\\+" group)
-	       (not (string-match ":\\(crap\\|spam\\|lists\\|corpus\\)\\."
+	       (not (string-match (concat ":" "\\(" "crap"
+					      "\\|" "spam"
+					      "\\|" "lists"
+					      "\\|" "corpus"
+					      "\\)" "\\.")
 				  group)))))
       bbdb-user-mail-names
       (concat "^"
@@ -384,6 +393,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 +425,10 @@
      (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 [backspace] '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)
@@ -705,6 +719,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 +750,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])