 ;;;;;;;;
 ;; ediff
 ;;;;;;;;
+(require 'ediff)
 ;; This is what you probably want if you are using a tiling window
 ;; manager under X, such as ratpoison.
 (setq ediff-window-setup-function 'ediff-setup-windows-plain)

;;;;;;;;
;; ido-mode
;;;;;;;;
(ido-mode 1)

;;;;;;;;
;; java-mode

;;  "Set `ansi-color-for-comint-mode' to t." t)
;;(setq ansi-color-names-vector ["black" "red3" "green3" "yellow3" "navy" "magenta3" "cyan3" "white"])
(add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on)

;;;;;;;;
;; uniquify
