Mercurial > dotfiles
changeset 122:c0b922a69304
Merge.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Thu, 02 Jul 2009 11:34:30 -0500 |
| parents | 8989839d4c6c (diff) 5f00625aa1ed (current diff) |
| children | b2a07050b430 |
| files | |
| diffstat | 5 files changed, 27 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.elisp/nose.el +++ b/.elisp/nose.el @@ -57,11 +57,13 @@ (defvar nose-global-name "nosetests") (defvar nose-use-verbose t) -(defun run-nose (&optional tests debug) +(defun run-nose (&optional tests debug failed) "run nosetests" (let* ((nose (nose-find-test-runner)) (where (nose-find-project-root)) - (args (if debug "--pdb" "")) + (args (concat (if debug "--pdb" "") + " " + (if failed "--failed" ""))) (tnames (if tests tests ""))) (funcall (if debug 'pdb @@ -76,10 +78,14 @@ (nose-find-test-runner) args where where tnames))) ) -(defun nosetests-all (&optional debug) +(defun nosetests-all (&optional debug failed) "run all tests" (interactive) - (run-nose nil debug)) + (run-nose nil debug failed)) + +(defun nosetests-failed (&optional debug) + (interactive) + (nosetests-all debug t)) (defun nosetests-pdb-all () (interactive)
--- a/.elisp/settings/40.modes.el +++ b/.elisp/settings/40.modes.el @@ -28,11 +28,16 @@ point." (add-hook 'ruby-mode-hook '(lambda () (af-tab-fix) (local-set-key (kbd "RET") - 'reindent-then-newline-and-indent))) + 'reindent-then-newline-and-indent) + (local-set-key (kbd "C-M-f") + 'textmate-find-in-project-type))) +(add-to-list 'auto-mode-alist '("\\.rake$" . ruby-mode)) (require 'django-html-mode) ;; I think I probably just always want it in django mode for now (add-to-list 'auto-mode-alist '("\\.html$'" . django-html-mode)) +(add-to-list 'auto-mode-alist '("\\.html.erb$'" . django-html-mode)) +(add-to-list 'auto-mode-alist '("\\.rhtml$'" . django-html-mode)) (add-hook 'django-html-mode-hook '(lambda () (local-set-key (kbd "RET") 'reindent-then-newline-and-indent))) @@ -47,6 +52,8 @@ point." (af-tab-fix) (easy-menu-add-item nil '("Python") ["Run All Tests" nosetests-all t] "Comment Out Region") + (easy-menu-add-item nil '("Python") ["Run All Tests with --failed" nosetests-failed t] + "Comment Out Region") (easy-menu-add-item nil '("Python") ["Run Module Tests" nosetests-module t] "Comment Out Region") (easy-menu-add-item nil '("Python") ["Run One Test" nosetests-one t]
--- a/.elisp/settings/50.localfuncs.el +++ b/.elisp/settings/50.localfuncs.el @@ -55,3 +55,8 @@ Symbols matching the text at point are p (interactive) (set-frame-parameter nil 'fullscreen (if (frame-parameter nil 'fullscreen) nil 'fullboth))) + + +(defun hg-rm-this-file () + (interactive) + (shell-command-to-string (concat "hg rm " buffer-file-name)))