# HG changeset patch
# User Luke Hoersten <Luke@Hoersten.org>
# Date 1372176774 18000
# Node ID e35be98bd58cf587c72c19f11be6746f319625fd
# Parent  7446c9ffe828e362ed3d8d82c4755a45119b3980
Tons more cleanups after emacs24 update.

diff -r 7446c9ffe828 -r e35be98bd58c color-theme-init.el
--- a/color-theme-init.el	Mon Jun 24 21:49:23 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-;; ~/.emacs.d/color-theme-init.el
-;; Luke Hoersten <Luke@Hoersten.org>
-
-;;; color theme
-(if window-system
-   (progn
-     (require 'color-theme)
-
-     ;; solarized
-     (add-to-list 'load-path "~/.emacs.d/thirdparty/color-theme-solarized")
-     (require 'color-theme-solarized)
-     (color-theme-solarized-light)
-     ;; (color-theme-solarized-dark)
-
-     ;; twilight
-     ;; (load "color-theme-twilight")
-     ;; (color-theme-twilight)
-     ))
-
-(message "Loading color-theme-init...done")
-(provide 'color-theme-init)
diff -r 7446c9ffe828 -r e35be98bd58c init.el
--- a/init.el	Mon Jun 24 21:49:23 2013 -0500
+++ b/init.el	Tue Jun 25 11:12:54 2013 -0500
@@ -7,7 +7,6 @@
 (setq-default
  ediff-split-window-function
   'split-window-horizontally              ; diff horizontally
- x-select-enable-clipboard t              ; paste from X buffer
  inhibit-splash-screen t                  ; disable splash screen
  truncate-lines t                         ; truncate, not wrap, lines
  indent-tabs-mode nil                     ; only uses spaces for indentation
@@ -136,7 +135,6 @@
 ;;; custom inits
 (require 'c-init)             ; c specific elisp
 (require 'align-with-spaces)  ; use only spaces for alignment
-(require 'pastebin-region)    ; send selected text to pastebin
 (require 'move-line)          ; move line up or down
 (require 'uniquify)           ; unique buffer names with dirs
 
@@ -177,7 +175,7 @@
 
 ;;; js2-mode
 (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
-(add-hook 'js-mode-hook 'js2-minor-mode)
+(setq-default ac-js2-evaluate-calls t)
 
 ;;; zencoding-mode - html
 (add-hook 'sgml-mode-hook 'zencoding-mode) ; Auto-start on any markup modes
@@ -199,9 +197,12 @@
 (add-hook
  'haskell-mode-hook
  (lambda ()
-   ;; (ghc-init)
+   ;; (ghc-init) ;; this breaks stuff
+   (local-set-key (kbd "C-c i") 'haskell-navigate-imports) ; go to imports. prefix to return
+   (flymake-haskell-multi-load)
+   (flymake-mode)
+   (capitalized-words-mode)
    (turn-on-haskell-indent)
-   (capitalized-words-mode)
    (turn-on-haskell-doc-mode)
    (turn-on-haskell-decl-scan)
    (imenu-add-menubar-index)
@@ -213,3 +214,15 @@
     haskell-indent-offset 4
     whitespace-line-column 78)
    ))
+
+;;; ghci-mode
+(add-hook 'inferior-haskell-mode-hook 'turn-on-ghci-completion)
+
+;;; flymake-mode
+(add-hook
+ 'flymake-mode-hook
+ (lambda ()
+   (local-set-key (kbd "C-1") 'flymake-display-err-menu-for-current-line)
+   (local-set-key (kbd "C-.") 'flymake-goto-next-error)
+   (local-set-key (kbd "C-,") 'flymake-goto-prev-error)
+   ))
diff -r 7446c9ffe828 -r e35be98bd58c pastebin-region.el
--- a/pastebin-region.el	Mon Jun 24 21:49:23 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-;; ~/.emacs.d/hoersten-pastebin-region.el
-;; Luke Hoersten <Luke@Hoersten.org>
-
-;; custom keys
-(global-set-key (kbd "C-c w") 'pastebin-region)
-
-;; Based on http://www.emacswiki.org/cgi-bin/wiki/download/pastebin.el
-(defvar pastebin-type-assoc
-  '((emacs-lisp-mode . "common-lisp")
-    (c-mode          . "c")
-    (python-mode     . "python")
-    (nxml-mode       . "xml")
-    (c++-mode        . "cpp")))
-
-(defun pastebin-region (start end)
-  "Send selected text to dpaste pastebin."
-  (interactive "r")
-  (let*
-      ((pastebin-url "http://inf/paste/")
-       (url-request-method "POST")
-       (url-request-extra-headers '(("Content-Type" . "application/x-www-form-urlencoded")))
-       (url-request-data
-        (format
-         "title=%s&content=%s&lexer=%s&author=%s"
-         (url-hexify-string (buffer-file-name))                                         ; title
-         (url-hexify-string (buffer-substring-no-properties start end))                 ; content
-         (url-hexify-string (or (assoc-default major-mode pastebin-type-assoc) "text")) ; lexer
-         (url-hexify-string (user-full-name)))))                                        ; author
-    (url-retrieve
-     pastebin-url
-     (lambda (arg)
-       (cond
-        ((equal :error (car arg))
-         (signal (cdr arg)))
-        ((equal :redirect (car arg))
-         (let ((redirected (cadr arg)))
-           (message redirected)
-           (with-temp-buffer
-             (insert redirected)
-             (clipboard-kill-ring-save (point-min) (point-max))))))))))
-
-(message "Loading pastebin-region...done")
-(provide 'pastebin-region)