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

diff --git a/dot/emacs b/dot/emacs
index 68c0068..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))))
 
@@ -575,8 +577,8 @@
       '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
 	csharp-mode-hook perl-mode-hook cperl-mode-hook
 	python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
-	tcl-mode-hook go-mode-hook js-mode-hook conf-mode-hook
-	m4-mode-hook autoconf-mode-hook autotest-mode-hook
+	tcl-mode-hook go-mode-hook js-mode-hook javascript-mode-hook
+	conf-mode-hook m4-mode-hook autoconf-mode-hook autotest-mode-hook
 	asm-mode-hook TeX-mode-hook LaTeX-mode-hook
 	TeXinfo-mode-hook tex-mode-hook latex-mode-hook
 	texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook