Permalink
Browse files

Merge remote branch 'mainline/master'

  • Loading branch information...
2 parents 5405d77 + 5c9e3b9 commit 86b9da0a4b316a50a5cbccd2c3ebf838b273377e @timcharper timcharper committed Dec 3, 2010
Showing with 1,734 additions and 1,120 deletions.
  1. +468 −148 elpa-to-submit/paredit.el
  2. +3 −0 init.el
  3. +1,221 −969 package.el
  4. +2 −0 starter-kit-bindings.el
  5. +12 −1 starter-kit-defuns.el
  6. +9 −0 starter-kit-eshell.el
  7. +8 −0 starter-kit-lisp.el
  8. +11 −2 starter-kit-misc.el
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -32,6 +32,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)
View
2,190 package.el

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -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)
View
@@ -79,7 +79,7 @@ Symbols matching the text at point are put first in the completion list."
)
(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))
@@ -216,10 +216,21 @@ 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 toggle-fullscreen ()
(interactive)
;; TODO: this only works for X. patches welcome for other OSes.
View
@@ -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)))
@@ -33,6 +35,13 @@
(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
;; * cloning git repos, github repos
View
@@ -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
View
@@ -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,6 +27,7 @@
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)
whitespace-line-column 100
@@ -81,9 +83,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
@@ -111,7 +117,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
@@ -126,7 +133,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

0 comments on commit 86b9da0

Please sign in to comment.