colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added emacs-testify

Browse Source 
Conflicts:

	init.el
This commit is contained in:
Ivan Malison 2013-04-25 16:35:51 -07:00
parent 767b5c276e
commit 83bb775e38
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -16,3 +16,6 @@
[submodule "themes/solarized"] [submodule "themes/solarized"]
path = themes/solarized path = themes/solarized
url = git@github.com:sellout/emacs-color-theme-solarized.git url = git@github.com:sellout/emacs-color-theme-solarized.git
[submodule "lisp/emacs-testify"]
path = lisp/emacs-testify
url = git@github.com:IvanMalison/emacs-testify.git

18
init.el
View File

@ -20,7 +20,8 @@
(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/zenburn") (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/zenburn")
(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/solarized") (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/solarized")
(load-theme 'solarized-dark t) (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
(load-theme 'zenburn t)
;; ============================================================================= ;; =============================================================================
;; General Emacs Options ;; General Emacs Options
@ -96,12 +97,9 @@
;; Multi-lining for python. ;; Multi-lining for python.
(require 'multi-line-it) (require 'multi-line-it)
(require 'emacs-testify)
(defun python-tabs () (add-hook 'python-mode-hook (lambda () (subword-mode 1)))
(setq tab-width 4
indent-tabs-mode t
python-indent-offset 4
(subword-mode t)))
;; ============================================================================= ;; =============================================================================
;; Custom Key Bindings ;; Custom Key Bindings
@ -116,10 +114,13 @@
;; Miscellaneous ;; Miscellaneous
(global-set-key "\C-x\C-b" 'buffer-menu) (global-set-key "\C-x\C-b" 'buffer-menu)
(global-set-key "\C-xw" 'whitespace-mode) (global-set-key "\C-xw" 'whitespace-mode)
(global-set-key "\C-cw" 'tmux-copy)
(global-set-key "\C-x\C-r" (lambda () (interactive) (revert-buffer t t))) (global-set-key "\C-x\C-r" (lambda () (interactive) (revert-buffer t t)))
(global-set-key "\C-c\C-c" 'comment-region) (global-set-key "\C-c\C-c" 'comment-region)
(global-set-key (kbd "C-c w") 'tmux-copy) (global-set-key (kbd "C-c w") 'tmux-copy)
(global-set-key (kbd "C-x O") (lambda () (interactive) (other-window -1))) (global-set-key (kbd "C-x O") (lambda () (interactive) (other-window -1)))
(global-set-key "\C-ct" 'testify-run-test)
(global-set-key "\C-c\C-t" 'testify-run-case)
;; Something will occasionally override this binding. ;; Something will occasionally override this binding.
(global-set-key "\C-cg" 'rope-goto-definition) (global-set-key "\C-cg" 'rope-goto-definition)
@ -226,6 +227,7 @@
'(background-color "#ffffd7") '(background-color "#ffffd7")
'(background-mode light) '(background-mode light)
'(cursor-color "#626262") '(cursor-color "#626262")
'(custom-safe-themes (quote ("fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "36a309985a0f9ed1a0c3a69625802f87dee940767c9e200b89cdebdb737e5b29" default))) '(custom-safe-themes (quote ("762d33a7e24260c48c6b16381d013bf86d8a0fd918700c702f35d0c7ee59b689" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "36a309985a0f9ed1a0c3a69625802f87dee940767c9e200b89cdebdb737e5b29" default)))
'(fci-rule-color "#383838") '(fci-rule-color "#383838")
'(foreground-color "#626262")) '(foreground-color "#626262")
'(safe-local-variable-values (quote ((python-indent . tab-width) (whitespace-line-column . 80) (lexical-binding . t)))))

1
lisp/emacs-testify Submodule

@ -0,0 +1 @@
Subproject commit 72809658f15c37ee99c3a3e210463ffce34da662