-;; start google-c-style with emacs
-(require 'google-c-style)
-(add-hook 'c-mode-hook 'google-set-c-style)
-(add-hook 'c++-mode-hook 'google-make-newline-indent)
+;(if (locate-library "ediff")
+; (progn
+; (autoload 'ediff-files "ediff")
+; (autoload 'ediff-buffers "ediff")
+;
+; (eval-after-load "ediff" '(progn
+; (message "doing ediff customisation")
+; (setq diff-switches "-u"
+; ediff-custom-diff-options "-U3"
+; ediff-split-window-function 'split-window-horizontally
+; ediff-window-setup-function 'ediff-setu;p-windows-plain)
+;
+; (add-hook 'ediff-startup-hook 'ediff-toggle-w;ide-display)
+; (add-hook 'ediff-cleanup-hook 'ediff-toggle-w;ide-display)
+; (add-hook 'ediff-suspend-hook 'ediff-toggle-wide-display)))))
+
+
+
+;(defun update-diff-colors ()
+; "update the colors for diff faces"
+; (set-face-attribute 'diff-added nil
+; :foreground "white" :background "blue")
+; (set-face-attribute 'diff-removed nil
+; :foreground "white" :background "red3")
+; (set-face-attribute 'diff-changed nil
+; :foreground "white" :background "purple"))
+;(eval-after-load "diff-mode"
+; '(update-diff-colors))
+
+
+
+;(require 'helm-ag)
+;(require 'flx)
+;(flx-ido-mode t)
+
+
+
+;(fringe-mode (quote (0 . 0)))
+