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

diff --git a/dot/emacs b/dot/emacs
index 44684ee..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)