More emacs fixups

git-svn-id: http://photonzero.com/dotfiles/trunk@87 23f722f6-122a-0410-8cef-c75bd312dd78
This commit is contained in:
michener 2011-03-24 00:42:34 +00:00
parent 1732d28374
commit d749c5905d
18 changed files with 8844 additions and 5 deletions

View file

@ -7,6 +7,7 @@
(add-to-list 'load-path "~/.emacs.d/icicles")
(add-to-list 'load-path "~/.emacs.d/tabbar")
(fset 'yes-or-no-p 'y-or-n-p)
(require 'icicles)
@ -20,6 +21,7 @@
;(require 'highlight-symbol)
(require 'auto-complete-config)
;; Hack to get *Messages* in viper-mode.
;; ;; (must be done after loading viper)
;; ;; Futzing with fundamental-mode doesn't seem to help.
@ -28,7 +30,6 @@
(viper-change-state-to-vi))
(add-to-list 'ac-dictionary-directories "~/.emacs.d/auto-complete/dict")
(ac-config-default)
(setq ac-dwim t)
@ -39,6 +40,7 @@
(setq viper-translate-all-ESC-keysequences nil)
(setq viper-always t)
(setq viper-vi-style-in-minibuffer nil)
(setq-default indent-tabs-mode nil)
;(define-key ac-completing-map "\t" 'ac-fuzzy-complete)
;(define-key ac-completing-map "\r" nil)
(define-key ac-completing-map (kbd "<escape>") 'ac-stop)
@ -87,7 +89,7 @@
; Basic frame defaults
(let ((background-color "#2F2F2F")
(foreground-color "LightGrey")
(fname "Inconsolata-18")
(fname "Inconsolata-13")
(fheight 45)
(fwidth 115))
@ -96,7 +98,7 @@
; (set-background-color background-color)
; (add-to-list 'default-frame-alist (cons 'background-color background-color))
; (set-foreground-color foreground-color)
(add-to-list 'default-frame-alist (cons 'foreground-color foreground-color))
; (add-to-list 'default-frame-alist (cons 'foreground-color foreground-color))
(add-to-list 'default-frame-alist (cons 'height fheight))
(add-to-list 'default-frame-alist (cons 'width fwidth))
)
@ -106,6 +108,23 @@
(color-theme-initialize)
(color-theme-barak)
(color-theme-barak-extras)
(setq font-lock-maximum-decoration 3)
(load "~/.emacs.d/haskell-mode/haskell-site-file")
(add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
;;(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
;;(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
(add-hook 'haskell-mode-hook 'turn-on-haskell-simple-indent)
(require 'highlight-parentheses)
(setq hl-paren-colors
'(;"#8f8f8f" ; this comes from Zenburn
; and I guess I'll try to make the far-outer parens look like this
"orange1" "yellow1" "greenyellow" "green1"
"springgreen1" "cyan1" "slateblue1" "magenta1" "purple"))
(add-hook 'emacs-lisp-mode-hook (lambda () (highlight-parentheses-mode)))
(defadvice viper-maybe-checkout (around viper-svn-checkin-fix activate)
"Advise viper-maybe-checkout to ignore svn files."