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

Merge remote-tracking branch 'origin/master' into yelp

Browse Source 
Conflicts:
	elpa/find-file-in-project-3.2/find-file-in-project.el
	init.el
	lisp/emacs-testify
This commit is contained in:
Ivan Malison 2013-07-18 20:26:45 -07:00
commit 27ec88c43e
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elpa/find-file-in-project-3.2/find-file-in-project.el
View File

@ -66,7 +66,7 @@
May be set using .dir-locals.el. Checks each entry if set to a list.")
(defvar ffip-patterns
'("*.html" "*.org" "*.txt" "*.md" "*.el" "*.clj" "*.py" "*.rb" "*.js" "*.pl"
'("*.html" "*.el" "*.clj" "*.py" "*.rb" "*.js"
"*.sh" "*.erl" "*.hs" "*.ml" "*.sql" "*.c" "*.erb")
"List of patterns to look for with `find-file-in-project'.")
@ -145,6 +145,7 @@ directory they are found in so that they are unique."
(interactive)
(setq ffip-project-files-cache '()))
(defun ffip-get-project-files ()
(when (equal (assoc (ffip-project-root) ffip-project-files-cache) nil)
(add-to-list 'ffip-project-files-cache `(,(ffip-project-root) ,(ffip-project-files))))

25
init.el
View File

@ -107,6 +107,7 @@
;; Yelp always uses tabs.
(add-hook 'python-mode-hook 'python-tabs)
(add-hook 'python-mode-hook (lambda () (subword-mode 1)))
;; =============================================================================
@ -133,6 +134,16 @@
(global-set-key "\C-ct" 'testify-run-test)
(global-set-key "\C-c\C-o" 'testify-run-case)
(global-set-key "\C-c1" 'evil-mode)
(global-set-key (kbd "C-c w") 'tmux-copy)
(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.
(global-set-key "\C-cg" 'rope-goto-definition)
;; Macros
(fset 'ipdb "import ipdb; ipdb.set_trace()")
;; =============================================================================
;; ELPA
@ -227,13 +238,11 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(ansi-color-names-vector ["#e4e4e4" "#d70000" "#5f8700" "#af8700" "#0087ff" "#af005f" "#00afaf" "#808080"])
'(ansi-color-names-vector ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "yellow"])
'(ansi-term-color-vector ["#3f3f3f" "#cc9393" "#7f9f7f" "#f0dfaf" "#8cd0d3" "#dc8cc3" "#93e0e3" "#dcdccc"])
'(background-color "#ffffd7")
'(background-mode light)
'(cursor-color "#626262")
'(custom-safe-themes (quote ("762d33a7e24260c48c6b16381d013bf86d8a0fd918700c702f35d0c7ee59b689" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "36a309985a0f9ed1a0c3a69625802f87dee940767c9e200b89cdebdb737e5b29" default)))
'(background-color nil)
'(background-mode dark)
'(cursor-color nil)
'(custom-safe-themes (quote ("36a309985a0f9ed1a0c3a69625802f87dee940767c9e200b89cdebdb737e5b29" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
'(fci-rule-color "#383838")
'(foreground-color "#626262")
'(safe-local-variable-values (quote ((python-indent . tab-width) (whitespace-line-column . 80) (lexical-binding . t)))))
'(foreground-color nil))