# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1283906003 18000
# Node ID 6aad20d9fcb0dc8f8da823eb147539fdf0e7f86d
# Parent  07c671c9610c0ef01b11b9e671c91bf5f289ec09
emacs gui: move gui initialization code to a function

Given the weirdness observed in gui init with daemon mode,
this should make life with daemon mode easier.

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
@@ -29,15 +29,6 @@
 (setq tool-bar-mode nil)
 (tool-bar-mode 0)
 
-;; scrollbars, but on the right, not the left
-(set-scroll-bar-mode 'right)
-
-;; Command is meta in OS X.
-(setq ns-command-modifier (quote meta))
-
-;; Don't popup new frames for opened files
-(setq ns-pop-up-frames nil)
-
 ; cause imenu to always rescan the buffer (for textmate-goto-symbol)
 (setq imenu-auto-rescan t)
 ;; better uniquify from http://metapundit.net/sections/blog/emacs_and_django
@@ -48,16 +39,32 @@
 (setq uniquify-ignore-buffers-re "^\\*")
 (setq hg-outgoing-repository "")
 (setq hg-incoming-repository "")
-; so that Cmd+H won't activate Hide Current
-; App and Cmd+Shift+q won't logout user.
-(setq mac-pass-command-to-system nil)
 
-(cond
- ((eq window-system 'ns) ;; OS X
-  (set-face-attribute 'default nil :height 120))
- (t ;; everywhere else
-  (set-face-attribute 'default nil :height 100)))
+;; Make this a function in case we have to re-run it. I've had weirdness
+;; ensue with daemon mode not always initializing everything the way I want
+;; in new frames.
+(defun af-gui-init ()
+  (interactive)
+  ;; so that Cmd+H won't activate Hide Current
+  ;; App and Cmd+Shift+q won't logout user.
+  (setq mac-pass-command-to-system nil)
+
+  ;; scrollbars, but on the right, not the left
+  (if (window-system) (set-scroll-bar-mode 'right))
+
+  ;; Command is meta in OS X.
+  (setq ns-command-modifier (quote meta))
+
+  ;; Don't popup new frames for opened files
+  (setq ns-pop-up-frames nil)
 
+  (cond
+   ((eq window-system 'ns) ;; OS X
+    (set-face-attribute 'default nil :height 120))
+   (t ;; everywhere else
+    (set-face-attribute 'default nil :height 100)))
+)
+(af-gui-init)
 ;; use y or n instead of yes or no
 (fset 'yes-or-no-p 'y-or-n-p)