Merge remote-tracking branch 'technomancy/master'

Conflicts:
	.gitignore

.gitignore

@@ -20,4 +20,5 @@ elpa-to-submit/nxhtml/etc/schema/xhtml-loader.rnc~
 session*
 tramp
 \#*
+history
 *.pyc

init.el

@@ -34,6 +34,9 @@
 (setq custom-file (concat dotfiles-dir "custom.el"))
 
 (require 'package)
+(dolist (source '(("technomancy" . "http://repo.technomancy.us/emacs/")
+                  ("elpa" . "http://tromey.com/elpa/")))
+  (add-to-list 'package-archives source t))
 (package-initialize)
 (require 'starter-kit-elpa)
 

starter-kit-bindings.el

@@ -71,6 +71,8 @@
 ;; So good!
 (global-set-key (kbd "C-x g") 'magit-status)
 
+(global-set-key (kbd "C-c q") 'join-line)
+
 ;; This is a little hacky since VC doesn't support git add internally
 (eval-after-load 'vc
   (define-key vc-prefix-map "i" '(lambda () (interactive)

starter-kit-defuns.el

@@ -78,7 +78,7 @@ Symbols matching the text at point are put first in the completion list."
   (auto-fill-mode t))
 
 (defun turn-on-hl-line-mode ()
-  (if window-system (hl-line-mode t)))
+  (when (> (display-color-cells) 8) (hl-line-mode t)))
 
 (defun turn-on-save-place-mode ()
   (setq save-place t))
@@ -214,10 +214,40 @@ Symbols matching the text at point are put first in the completion list."
        (list ?\"))
   (paredit-mode 1))
 
+(defun esk-space-for-delimiter? (endp delimiter)
+  (not (member major-mode '(ruby-mode espresso-mode js2-mode))))
+
+(eval-after-load 'paredit
+  '(add-to-list 'paredit-space-for-delimiter-predicates
+                'esk-space-for-delimiter?))
+
 (defun message-point ()
   (interactive)
   (message "%s" (point)))
 
+(defun esk-disapproval ()
+  (interactive)
+  (insert "ಠ_ಠ"))
+
+(defun esk-agent-path ()
+  (if (eq system-type 'darwin)
+      "*launch*/Listeners"
+    "*ssh*/agent\.*"))
+
+(defun esk-find-agent ()
+  (let* ((path-clause (format "-path \"%s\"" (esk-agent-path)))
+         (find-command (format "$(find -L /tmp -uid $UID %s -type s 2> /dev/null)"
+                               path-clause)))
+    (first (split-string
+            (shell-command-to-string
+             (format "/bin/ls -t1 %s | head -1" find-command))))))
+
+(defun fix-agent ()
+  (interactive)
+  (let ((agent (esk-find-agent)))
+    (setenv "SSH_AUTH_SOCK" agent)
+    (message agent)))
+
 (defun toggle-fullscreen ()
   (interactive)
   ;; TODO: this only works for X. patches welcome for other OSes.

starter-kit-eshell.el

@@ -13,6 +13,8 @@
      (require 'em-cmpl)
      (setenv "PAGER" "cat")
      (set-face-attribute 'eshell-prompt nil :foreground "turquoise1")
+     (add-hook 'eshell-mode-hook ;; for some reason this needs to be a hook
+               '(lambda () (eshell/export "TERM" "dumb")))
      (when (< emacs-major-version 23)
        (add-hook 'eshell-mode-hook ;; for some reason this needs to be a hook
                  '(lambda () (define-key eshell-mode-map "\C-a" 'eshell-bol)))
@@ -30,8 +32,15 @@
   "Change directory to the project's root."
   (eshell/cd (locate-dominating-file default-directory "src")))
 
-(defun eshell/find (dir &rest opts)
-  (find-dired dir (mapconcat 'identity opts " ")))
+;; (defun eshell/find (dir &rest opts)
+;;   (find-dired dir (mapconcat 'identity opts " ")))
+
+;; (defun eshell/scp (&rest args)
+;;   "scp: now without colon-omitting annoyance!"
+;;   (when (null (remove-if-not (lambda (arg) (string-match ":" arg))
+;;                              args))
+;;     (error "Surely you meant to add a colon in there somewhere?"))
+;;   (shell-command (mapconcat 'identity (cons "scp" args) " ")))
 
 ;; Port features from
 ;; http://blog.peepcode.com/tutorials/2009/shell-method-missing/shell_method_missing.rb

starter-kit-lisp.el

@@ -63,5 +63,13 @@
                                                (match-end 1) "ƒ")
                                nil))))))
 
+(eval-after-load 'slime
+  '(define-key slime-mode-map (kbd "C-c p")
+     'slime-pprint-eval-last-expression))
+
+(eval-after-load 'slime-repl
+  '(define-key slime-repl-mode-map (kbd "C-c p")
+     'slime-pprint-eval-last-expression))
+
 (provide 'starter-kit-lisp)
 ;; starter-kit-lisp.el ends here

starter-kit-misc.el

@@ -16,6 +16,7 @@
 (ansi-color-for-comint-mode-on)
 
 (setq visible-bell t
+      fringe-mode (cons 4 0)
       echo-keystrokes 0.1
       font-lock-maximum-decoration t
       inhibit-startup-message t
@@ -26,8 +27,9 @@
       require-final-newline t
       truncate-partial-width-windows nil
       uniquify-buffer-name-style 'forward
+      ffap-machine-p-known 'reject
       whitespace-style '(trailing lines space-before-tab
-                                  indentation space-after-tab)
+                                  face indentation space-after-tab)
       whitespace-line-column 100
       ediff-window-setup-function 'ediff-setup-windows-plain
       oddmuse-directory (concat dotfiles-dir "oddmuse")
@@ -92,9 +94,13 @@
 (defalias 'yes-or-no-p 'y-or-n-p)
 (random t) ;; Seed the random-number generator
 
+(defalias 'auto-revert-tail-mode 'tail-mode)
+
 ;; Hippie expand: at times perhaps too hip
 (delete 'try-expand-line hippie-expand-try-functions-list)
 (delete 'try-expand-list hippie-expand-try-functions-list)
+(delete 'try-complete-file-name-partially hippie-expand-try-functions-list)
+(delete 'try-complete-file-name hippie-expand-try-functions-list)
 
 ;; Don't clutter up directories with files~
 (setq backup-directory-alist `(("." . ,(expand-file-name
@@ -122,7 +128,8 @@
     (add-to-list 'grep-find-ignored-files "*.class")))
 
 ;; Default to unified diffs
-(setq diff-switches "-u")
+(setq diff-switches "-u -w"
+      magit-diff-options "-w")
 
 ;; Cosmetics
 
@@ -137,7 +144,9 @@
 (eval-after-load 'magit
   '(progn
      (set-face-foreground 'magit-diff-add "green3")
-     (set-face-foreground 'magit-diff-del "red3")))
+     (set-face-foreground 'magit-diff-del "red3")
+     (when (not window-system)
+       (set-face-background 'magit-item-highlight "white"))))
 
 (eval-after-load 'mumamo
   '(eval-after-load 'zenburn