X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=blobdiff_plain;f=home%2Femacs%2Fian.el;fp=home%2Femacs%2Fian.el;h=06909f1199af076d94afd97bb1b9570fdfed1c1d;hp=e846da6b9b682bb624801980e96a42839b621d27;hb=fdfa6e9bcb558574f56e4d0e620562f754a48664;hpb=f22d3b792d7689ce773bdc76a680b37825679750

diff --git a/home/emacs/ian.el b/home/emacs/ian.el
index e846da6..06909f1 100644
--- a/home/emacs/ian.el
+++ b/home/emacs/ian.el
@@ -41,7 +41,13 @@
 (display-time)
 ;
 (set-default 'indent-line-function 'insert-tab)
-(set-default 'electric-indent-mode nil)
+(defun defuse-electrocuting-indent ()
+  "Disable electric-indent-mode if indent-line-function is daft"
+  (and
+   (eq indent-line-function 'insert-tab)
+   (electric-indent-local-mode 0)))
+(add-hook 'after-change-major-mode-hook 'defuse-electrocuting-indent)
+;
 (set-variable 'search-repeat-char 28)
 (set-fringe-mode (cons 0 nil))
 (if (string-match "^19\." emacs-version)