0
@@ -3,6 +3,9 @@
0
 ;; by Phil Hagelberg
0
 ;; Much thanks to RMS and emacswiki.org
0
 
0
+;; All files distributed under the same terms as GNU Emacs unless
0
+;; otherwise stated.
0
+
0
 ;; Note: this relies on files found in my .emacs.d:
0
 ;; http://github.com/technomancy/dotfiles
0
 

0
@@ -114,7 +114,8 @@
0
   (set (make-local-variable 'comment-auto-fill-only-comments) t)
0
   (make-local-variable 'column-number-mode)
0
   (column-number-mode t)
0
-  (if (window-system) (hl-line-mode))
0
+  (auto-fill-mode)
0
+  (if (window-system) (hl-line-mode t))
0
   (idle-highlight))
0
 
0
 (defun untabify-buffer ()
0
@@ -225,9 +226,12 @@
0
                          (thing-at-point 'filename))))
0
 
0
 (defun switch-or-start (function buffer)
0
-  (if (get-buffer buffer)
0
-      (switch-to-buffer buffer)
0
-    (funcall function)))
0
+  "If the buffer is current, bury it, otherwise invoke the function."
0
+  (if (equal (buffer-name (current-buffer)) buffer)
0
+      (bury-buffer)
0
+    (if (get-buffer buffer)
0
+        (switch-to-buffer buffer)
0
+      (funcall function))))
0
 
0
 (defun gd (&optional arg)
0
   "Git diff for use in eshell."

0
@@ -32,6 +32,7 @@
0
                                   indentation space-after-tab)
0
       whitespace-line-column 100
0
       sql-server "localhost"
0
+      ediff-window-setup-function 'ediff-setup-windows-plain
0
       save-place-file (convert-standard-filename "~/.emacs.d/places")
0
       browse-url-browser-function 'browse-url-generic
0
       browse-url-generic-program "~/src/conkeror/conkeror")

0
@@ -74,8 +74,8 @@
0
 
0
 (defun ruby-test-file ()
0
   (interactive)
0
-  (if (string-match "_test.rb$" buffer-file-name)
0
-      (compile (concat "ruby " buffer-file-name))
0
+  (if (string-match "test.*\.rb$" buffer-file-name)
0
+      (compile (concat ruby-test-program " " buffer-file-name))
0
     (toggle-buffer)
0
     (compile (concat ruby-test-program " -I:../lib " buffer-file-name))
0
     (toggle-buffer)))

0
@@ -18,5 +18,6 @@ alias grepp ps aux | grep $*
0
 alias l ls -a -l $*
0
 alias la ls -a $*
0
 alias ll ls -l $*
0
+alias lh ls -l -h $*
0
 alias devlog tail -F log/development.log
0
 alias nil $*