0
@@ -63,3 +63,7 @@ fi
0
 if [ -f /etc/bashrc ]; then
0
         . /etc/bashrc
0
 fi
0
+
0
+if [ -f $HOME/.java_profile ]; then
0
+    source $HOME/.java_profile
0
+fi
0
\ No newline at end of file

0
@@ -1,8 +1,8 @@
0
 (if (or (matches (window_name) "Firefox")
0
         (matches (window_name) "Gran Paradiso")
0
         (matches (application_name) "macs")
0
-	(matches (application_name) "conkeror")
0
-	(matches (application_name) "erminal")
0
+        (matches (application_name) "conkeror")
0
+        (matches (application_name) "erminal")
0
         (matches (window_name) "^screen$"))
0
     (begin
0
       (undecorate)

0
@@ -1626,6 +1626,9 @@ If you are missing standard faces in this theme, please notify the maintainer."
0
      (eshell-prompt-face ((t (:foreground "Red" :bold t))))
0
      (eshell-test-failed-face ((t (:foreground "OrangeRed" :bold t))))
0
      (eshell-test-ok-face ((t (:foreground "Green" :bold t))))
0
+     (minibuffer-prompt ((t (:foreground "Blue"))))
0
+     (ido-first-match ((t (:foreground "Black" :bold t))))
0
+     (ido-only-match ((t (:foreground "Black"))))
0
      (excerpt ((t (:italic t))))
0
      (fixed ((t (:bold t))))
0
      (flyspell-duplicate-face ((t (:foreground "Gold3" :bold t :underline t))))
0
@@ -1715,10 +1718,13 @@ If you are missing standard faces in this theme, please notify the maintainer."
0
      (message-header-to-face ((t (:foreground "MidnightBlue" :bold t))))
0
      (message-header-xheader-face ((t (:foreground "blue"))))
0
      (message-separator-face ((t (:foreground "brown"))))
0
-     (modeline ((t (:foreground "white" :background "black"))))
0
-     (modeline-buffer-id ((t (:foreground "white" :background "black"))))
0
-     (modeline-mousable ((t (:foreground "white" :background "black"))))
0
-     (modeline-mousable-minor-mode ((t (:foreground "white" :background "black"))))
0
+     (mode-line ((t (:foreground "Black" :background "#dddddd"
0
+                                 :box (:color "#888888" :line-width 1)))))
0
+     (mode-line-inactive ((t (:background "#aaaaaa" :foreground "Black"
0
+                                          :box (:color "#888888" :line-width 1)))))
0
+     (mode-line-buffer-id ((t (:foreground "Black"))))
0
+     (mode-line-mousable ((t (:foreground "white" :background "black"))))
0
+     (mode-line-mousable-minor-mode ((t (:foreground "white" :background "black"))))
0
      (region ((t (:background "gray"))))
0
      (secondary-selection ((t (:background "paleturquoise"))))
0
      (show-paren-match-face ((t (:background "turquoise"))))

0
@@ -86,24 +86,24 @@ Files with duplicate filenames are suffixed with the name of the
0
 directory they are found in so that they are unique."
0
   (let ((file-alist nil))
0
     (mapcar (lambda (file)
0
-	      (let ((file-cons (cons (file-name-nondirectory file)
0
-				     (expand-file-name file))))
0
-		(when (assoc (car file-cons) file-alist)
0
-		  (ffip-uniqueify (assoc (car file-cons) file-alist))
0
-		  (ffip-uniqueify file-cons))
0
-		(add-to-list 'file-alist file-cons)
0
-		file-cons))
0
-	    (split-string (shell-command-to-string (concat "find " (or ffip-project-root
0
-								       (ffip-project-root))
0
-							   " -type f -regex \""
0
-							   ffip-regexp
0
-							   "\" " ffip-find-options))))))
0
+              (let ((file-cons (cons (file-name-nondirectory file)
0
+                                     (expand-file-name file))))
0
+                (when (assoc (car file-cons) file-alist)
0
+                  (ffip-uniqueify (assoc (car file-cons) file-alist))
0
+                  (ffip-uniqueify file-cons))
0
+                (add-to-list 'file-alist file-cons)
0
+                file-cons))
0
+            (split-string (shell-command-to-string (concat "find " (or ffip-project-root
0
+                                                                       (ffip-project-root))
0
+                                                           " -type f -regex \""
0
+                                                           ffip-regexp
0
+                                                           "\" " ffip-find-options))))))
0
 
0
 (defun ffip-uniqueify (file-cons)
0
   "Set the car of the argument to include the directory name plus the file name."
0
   (setcar file-cons
0
-	  (concat (car file-cons) ": "
0
-		  (cadr (reverse (split-string (cdr file-cons) "/"))))))
0
+          (concat (car file-cons) ": "
0
+                  (cadr (reverse (split-string (cdr file-cons) "/"))))))
0
 
0
 (defun find-file-in-project ()
0
   "Prompt with a completing list of all files in the project to find one.
0
@@ -113,11 +113,11 @@ an `.emacs-project' file. You can override this by locally
0
 setting the `ffip-project-root' variable."
0
   (interactive)
0
   (let* ((project-files (ffip-project-files))
0
-	 (file (if (functionp 'ido-completing-read)
0
-		   (ido-completing-read "Find file in project: "
0
-					(mapcar 'car project-files))
0
-		 (completing-read "Find file in project: "
0
-				  (mapcar 'car project-files)))))
0
+         (file (if (functionp 'ido-completing-read)
0
+                   (ido-completing-read "Find file in project: "
0
+                                        (mapcar 'car project-files))
0
+                 (completing-read "Find file in project: "
0
+                                  (mapcar 'car project-files)))))
0
     (find-file (cdr (assoc file project-files)))))
0
 
0
 (defun ffip-project-root (&optional dir)

0
@@ -120,8 +120,8 @@
0
 
0
 (eval-after-load 'ruby-mode '(require 'my-ruby))
0
 (eval-after-load 'javascript-mode '(require 'my-js))
0
-(eval-after-load 'jabber-connect '(load "jabber-config"))
0
-(eval-after-load 'rcirc '(load "rcirc-config"))
0
+(eval-after-load 'jabber '(load "my-jabber"))
0
+(eval-after-load 'rcirc '(load "my-rcirc"))
0
 
0
 ;; Well, these autoloads have to get invoked somehow.
0
 (add-to-list 'auto-mode-alist '("\\.rb$" . ruby-mode))

0
@@ -13,6 +13,9 @@
0
 (global-set-key (kbd "C-c l") (lambda () (interactive) (insert "lambda")))
0
 (global-set-key (kbd "C-x \\") 'align-regexp)
0
 (global-set-key (kbd "M-/") 'hippie-expand)
0
+(global-set-key (kbd "C-c n") (lambda () (interactive)
0
+                                (delete-trailing-whitespace)
0
+                                (untabify-buffer)))
0
 
0
 ;;; Navigation
0
 
0
@@ -34,6 +37,8 @@
0
 (global-set-key "\C-c\C-t" 'toggle-buffer)
0
 (global-set-key (kbd "C-x C-M-f") 'find-file-in-project)
0
 (global-set-key (kbd "C-c f") 'recentf-ido-find-file)
0
+(global-set-key (kbd "C-x C-p") 'find-file-at-point)
0
+(global-set-key (kbd "C-c b") 'bury-buffer)
0
 
0
 ;;; Window management
0
 
0
@@ -65,6 +70,7 @@
0
 (global-set-key (kbd "C-x w") 'w3m)
0
 (global-set-key "\C-xh" 'view-url)
0
 (global-set-key "\C-cT" 'twittering-update-status-interactive)
0
+(global-set-key (kbd "C-c o") 'google-region)
0
 
0
 ;;; Utility
0
 

0
@@ -23,6 +23,12 @@
0
                                      (apropos-internal "-mode$"
0
                                                        'commandp))))))
0
 
0
+(defun google-region (&optional flags)
0
+  "Google the selected region."
0
+  (interactive)
0
+  (browse-url (concat "http://www.google.com/search?ie=utf-8&oe=utf-8&q="
0
+                      (buffer-substring (region-beginning) (region-end)))))
0
+
0
 (defun map-coords (lat lng)
0
   "Show a Yahoo map marked with the point LAT by LNG."
0
   (interactive "BLatitude: \nBLongitude")
0
@@ -72,12 +78,13 @@
0
         (isearch-forward regexp-p no-recursive-edit)))))
0
 
0
 (defun current-window ()
0
-  "Why get-buffer-window instead of buffer-window? Why isn't this defined already?"
0
+  "Why isn't this defined already?"
0
   (get-buffer-window (current-buffer)))
0
 
0
 (defun toggle-dedicated-window ()
0
   "Toggle the window-dedicated-p state of current window."
0
-  (set-window-dedicated-p (current-window) (not (window-dedicated-p (current-window)))))
0
+  (set-window-dedicated-p (current-window)
0
+                          (not (window-dedicated-p (current-window)))))
0
 
0
 (defun window-small-and-large ()
0
   (interactive)
0
@@ -92,7 +99,7 @@
0
   ;; (untabify-buffer)
0
   (whitespace-mode t)
0
   (make-local-variable 'column-number-mode)
0
-  (column-number-mode)
0
+  (column-number-mode t)
0
   (if (window-system) (hl-line-mode))
0
   (idle-highlight))
0
 
0
@@ -120,7 +127,9 @@
0
                                     ,(make-char 'greek-iso8859-7 107))
0
                     nil))))))
0
 
0
-(defun terminus () (interactive) (set-default-font "-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-1"))
0
+(defun terminus () (interactive)
0
+  (set-default-font
0
+   "-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-1"))
0
 (defun inconsolata () (interactive) (set-default-font "Inconsolata-12"))
0
 (defun dvsm () (interactive) (set-default-font "DejaVu Sans Mono-10"))
0
 
0
@@ -136,17 +145,25 @@
0
 
0
 ;;; Random stuff
0
 
0
+(defadvice find-file-at-point (around goto-line compile activate)
0
+  (let ((line (and (looking-at ".*:\\([0-9]+\\)")
0
+                   (string-to-number (match-string 1)))))
0
+    ad-do-it
0
+    (and line (goto-line line))))
0
+
0
 (defun my-recompile-init ()
0
   (interactive)
0
   (byte-recompile-directory (expand-file-name "~/.emacs.d") 0))
0
 
0
 (defun my-generate-elisp-tags ()
0
   (interactive)
0
-  (shell-command "find ~/.emacs.d ~/src/emacs -name \\*el | xargs etags -o ~/.emacs.d/TAGS"))
0
+  (shell-command
0
+   "find ~/.emacs.d ~/src/emacs -name \\*el | xargs etags -o ~/.emacs.d/TAGS"))
0
 
0
 (defun my-generate-rails-tags ()
0
   (interactive)
0
-  (shell-command (format "find %s | egrep \"rb$\" | xargs ctags-exuberant -a -e -f %s/TAGS --exclude=vendor --exclude=public --exclude=log --exclude=db"
0
+  (shell-command
0
+   (format "find %s | egrep \"rb$\" | xargs ctags-exuberant -a -e -f %s/TAGS --exclude=vendor --exclude=public --exclude=log --exclude=db"
0
                          (rails-root) (rails-root)))
0
   (visit-tags-table (concat (rails-root) "/TAGS")))
0
 
0
@@ -165,8 +182,8 @@
0
   "Insert a lorem ipsum."
0
   (interactive)
0
   (insert "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do "
0
-          "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad "
0
-          "minim veniam, quis nostrud exercitation ullamco laboris nisi ut "
0
+          "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim"
0
+          "ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut "
0
           "aliquip ex ea commodo consequat. Duis aute irure dolor in "
0
           "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla "
0
           "pariatur. Excepteur sint occaecat cupidatat non proident, sunt in "

0
@@ -14,9 +14,10 @@
0
 
0
 (font-lock-add-keywords
0
  'javascript-mode `(("\\(function *\\)("
0
-		     (0 (progn (compose-region (match-beginning 1) (match-end 1)
0
-					       ,(make-char 'greek-iso8859-7 107))
0
-			       nil)))))
0
+                     (0 (progn (compose-region (match-beginning 1) (match-end 1)
0
+                                               ,(make-char 'greek-iso8859-7
0
+                                                           107))
0
+                               nil)))))
0
 
0
 (font-lock-add-keywords
0
  'ruby-mode

0
@@ -44,6 +44,7 @@
0
 (winner-mode t)
0
 (recentf-mode 1)
0
 (show-paren-mode 1)
0
+(mouse-avoidance-mode 'exile)
0
 
0
 (when (> emacs-major-version 21)
0
   (ido-mode t)

0
@@ -158,9 +158,10 @@
0
 
0
 (add-hook 'ruby-mode-hook
0
           (lambda ()
0
-	    (when (and buffer-file-name (file-writable-p buffer-file-name))
0
-		(local-set-key "C-c d" 'flymake-display-err-menu-for-current-line)
0
-		(flymake-mode t))))
0
+            (when (and buffer-file-name (file-writable-p buffer-file-name))
0
+              (local-set-key (kbd "C-c d")
0
+                             'flymake-display-err-menu-for-current-line)
0
+              (flymake-mode t))))
0
 
0
 (ignore-errors
0
   (add-to-list 'load-path "~/src/rinari")

0
@@ -1,3 +1,4 @@
0
 export PATH=$PATH:/sbin:/usr/sbin:~/bin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/home/phil/bin/jruby-1.1.2/bin:/var/lib/gems/1.8/bin
0
 export EDITOR="emacsclient"
0
-export JRUBY_HOME=/home/phil/bin/jruby-1.1.2
0
\ No newline at end of file
0
+export JRUBY_HOME=/home/phil/bin/jruby-1.1.2
0
+export JAVA_OPTS="-client"
0
\ No newline at end of file

0
@@ -68,6 +68,7 @@
0
 - rxvt-unicode
0
 - screen
0
 - service-discovery-applet
0
+- sloccount
0
 - snes9x-x
0
 - sqlite3
0
 - sshfs

0
@@ -9,8 +9,8 @@ require 'fileutils'
0
 begin
0
   FileUtils.cd(File.expand_path("~/.watcher"))
0
 rescue
0
-  puts "You need ~/.watcher/config to contain a sender jabber ID, password, and recipient
0
-jabber ID on their own lines."
0
+  puts "You need ~/.watcher/config to contain a sender jabber ID, password, and
0
+recipient jabber ID on their own lines."
0
   exit 1
0
 end
0
 
0
@@ -23,7 +23,7 @@ unless File.exist?(hash)
0
   include Jabber
0
   jid, password, to = File.read('config').split("\n")
0
   message = "#{ARGV.first} changed to #{content[0 .. 200]} ..."
0
-  
0
+
0
   jid = JID::new("#{jid}/#{`hostname`.chomp}-watcher")
0
   client = Client::new(jid)
0
   client.connect