# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1246552470 18000
# Node ID c0b922a69304338cce444881d39e7fde6140b8f6
# Parent  8989839d4c6c29a6878776807c37b541ef3417db# Parent  5f00625aa1ed625fb877015a314cd6dacee6a985
Merge.

diff --git a/.elisp/nose.el b/.elisp/nose.el
--- 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)
diff --git a/.elisp/settings/40.modes.el b/.elisp/settings/40.modes.el
--- 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]
diff --git a/.elisp/settings/50.localfuncs.el b/.elisp/settings/50.localfuncs.el
--- 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)))
diff --git a/.hgglobalignore b/.hgglobalignore
--- a/.hgglobalignore
+++ b/.hgglobalignore
@@ -1,6 +1,7 @@
 syntax:glob
-*.pyc
 *.o
+*.pyc
+*.pyo
 *.beam
 .DS_Store
 \#*\#
diff --git a/.irbrc b/.irbrc
--- a/.irbrc
+++ b/.irbrc
@@ -5,3 +5,5 @@ IRB.conf[:LOAD_MODULES] = []  unless IRB
 unless IRB.conf[:LOAD_MODULES].include?('irb/completion')
   IRB.conf[:LOAD_MODULES] << 'irb/completion'
 end
+IRB.conf[:SAVE_HISTORY] = 1000
+IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb-save-history"