# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1261024135 21600
# Node ID fd92c15701ae96c6948132dfd995fcfbc62217c4
# Parent  593b5263291db216164a18c13ee7b3005e3168b7# Parent  040ac89ffe1e1aa326dd77a04f898fefcd4a5266
Merge

diff --git a/.elisp/settings/50.preferences.el b/.elisp/settings/50.preferences.el
--- a/.elisp/settings/50.preferences.el
+++ b/.elisp/settings/50.preferences.el
@@ -62,7 +62,11 @@
 ; App and Cmd+Shift+q won't logout user.
 (setq mac-pass-command-to-system nil)
 
-(set-face-attribute 'default nil :height 100)
+(cond
+ ((eq window-system 'ns) ;; OS X
+  (set-face-attribute 'default nil :height 120))
+ (t ;; everywhere else
+  (set-face-attribute 'default nil :height 100)))
 
 ;; use y or n instead of yes or no
 (fset 'yes-or-no-p 'y-or-n-p)
diff --git a/.elisp/textmate.el b/.elisp/textmate.el
--- a/.elisp/textmate.el
+++ b/.elisp/textmate.el
@@ -423,7 +423,8 @@ specific type of file."
   "Returns the current project root."
   (when (or
          (null *textmate-project-root*)
-         (not (string-match *textmate-project-root* default-directory)))
+         (not (string-match *textmate-project-root* default-directory))
+         (not (string-match *textmate-project-root* (getenv "HOME"))))
     (let ((root (textmate-find-project-root)))
       (if root
           (setq *textmate-project-root* (expand-file-name (concat root "/")))
diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -12,6 +12,7 @@ hgext.purge=
 hgext.rebase=
 hgext.record=
 hgext.transplant=
+hgext.schemes=
 hggit=
 hgsubversion=
 histedit=