X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c24a0acd7dc429debf946dfbef5e81bbaa7184c0..01a478c25beae3abbed42c8515ff7d7b1b2157a4:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 44905b1..7c2e73f 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -46,8 +46,8 @@
      (add-to-list 'auto-mode-alist
 		  `(,(concat "/debian/"
 			       "\\("
-				 "[" "[:lower:][:digit:]]"
-				     "[[:lower:][:digit:].+-" "]+"
+				 "[" "[:lower:]" "[:digit:]" "]"
+				 "[" "[:lower:]" "[:digit:]" ".+-" "]+"
 				 "\\."
 			       "\\)?"
 			       "changelog\\'")
@@ -60,6 +60,7 @@
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
 (setq magit-log-cutoff-length 512)
+(add-hook 'magit-mode-hook 'magit-load-config-extensions)
 
 (trap (or mdw-fast-startup (require 'p4)))
 
@@ -482,6 +483,7 @@
      (or (lookup-key dired-mode-map  [?\C-x ?\C-q])
 	 (define-key dired-mode-map [?\C-x ?\C-q]
 	   'wdired-change-to-wdired-mode))
+     (trap (require 'dired-x))
      (and (fboundp 'dired-do-relsymlink)
 	  (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink))))