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

diff --git a/home/emacs/ian.el b/home/emacs/ian.el
index e846da6..2b4616b 100644
--- a/home/emacs/ian.el
+++ b/home/emacs/ian.el
@@ -6,6 +6,8 @@
       cperl-indent-level 4
       cperl-continued-statement-offset 4)
 
+(load-library "vm-reply")
+
 (make-variable-buffer-local 'indent-line-function)
 ; Un-disable narrow and eval-expression
 (put 'narrow-to-region 'disabled nil)
@@ -41,7 +43,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)
@@ -97,6 +105,8 @@
   (global-set-key "" 'quicker-compile)
   (global-set-key "" 'exchange-point-and-mark)
   (global-set-key "" 'load-tramp)
+  (global-set-key "g" 'magit-status)
+  (global-set-key "g" 'magit-dispatch-popup)
   (global-set-key "4" 'scroll-other-window)
   (global-set-key "4m" 'vm-mail-other-window)
   (global-set-key "9" 'vm-visit-folder)
@@ -541,6 +551,17 @@ The citation string is taken from cite-string."
 ;
 ;
 
+(winner-mode t)
+
+(global-magit-file-mode)
+
+(magit-wip-after-save-mode)
+(magit-wip-after-apply-mode)
+(magit-wip-before-change-mode)
+(setq magit-no-confirm
+      (append magit-no-confirm '(safe-with-wip)))
+
+(setq vc-handled-backends (delq 'Git vc-handled-backends))
 
 ;; (defun hack-dir-local-variables ()
 ;;   "Read per-directory local variables for the current buffer.