found

[ian-dotfiles.git] / home / emacs / ian.el

diff --git a/home/emacs/ian.el b/home/emacs/ian.el
index e846da6b9b682bb624801980e96a42839b621d27..c963fbb5172ba70385152d1d8bfb7e86b8fead43 100644 (file)
--- a/home/emacs/ian.el
+++ b/home/emacs/ian.el
@@ -2,16 +2,20 @@
 ; 
 
 (defalias 'perl-mode 'cperl-mode)
-(setq cperl-invalid-face nil
-      cperl-indent-level 4
-      cperl-continued-statement-offset 4)
+(setq cperl-invalid-face nil)
+;      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)
 (put 'eval-expression 'disabled nil)
 ;(standard-display-european t)
-;
+
+(setq visible-cursor nil)
+
 (setq browse-url-netscape-program "mozilla")
 (setq common-lisp-hyperspec-root "/usr/share/doc/hyperspec/")
 ;
@@ -32,7 +36,7 @@
 ; (if (string= (getenv "TERM") "bbcb32") (setq term-file-prefix nil))
 ; (setq explicit-shell-file-name "/usr/local/bin/tcsh")
 (setq inhibit-local-variables t)
-(setq enable-local-variables 'ask-me)
+(setq enable-local-variables :safe)
 (setq enable-recursive-minibuffers t)
 (setq compile-command "make")
 (setq next-line-add-newlines t)
@@ -41,7 +45,17 @@
 (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)
+
+(eval-after-load "sh-script"
+  '(add-hook 'sh-mode-hook (lambda () (sh-electric-here-document-mode 0))
+            t))
+;
 (set-variable 'search-repeat-char 28)
 (set-fringe-mode (cons 0 nil))
 (if (string-match "^19\." emacs-version)
@@ -97,6 +111,8 @@
   (global-set-key "\18\v" 'quicker-compile)
   (global-set-key "\18\18" 'exchange-point-and-mark)
   (global-set-key "\18\1a" 'load-tramp)
+  (global-set-key "\18g" 'magit-status)
+  (global-set-key "\18\eg" 'magit-dispatch-popup)
   (global-set-key "\184\16" 'scroll-other-window)
   (global-set-key "\184m" 'vm-mail-other-window)
   (global-set-key "\189" 'vm-visit-folder)
@@ -541,6 +557,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.