Mercurial > dotfiles
changeset 173:fd92c15701ae
Merge
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Wed, 16 Dec 2009 22:28:55 -0600 |
| parents | 593b5263291d (diff) 040ac89ffe1e (current diff) |
| children | 014e745b2d04 |
| files | .elisp/settings/50.preferences.el |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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 "/")))