Load environment from a *shudder* plist.xml file on OS X.

Move platform-specific code to starter-kit-misc.el.

init.el

@@ -64,10 +64,6 @@
 (regen-autoloads)
 (load custom-file 'noerror)
 
-;; Work around a bug on OS X where system-name is FQDN
-(if (eq system-type 'darwin)
-    (setq system-name (car (split-string system-name "\\."))))
-
 ;; You can keep system- or user-specific customizations here
 (setq system-specific-config (concat dotfiles-dir system-name ".el")
       user-specific-config (concat dotfiles-dir user-login-name ".el")

starter-kit-misc.el

@@ -118,11 +118,20 @@
 
 (eval-after-load 'mumamo
   '(eval-after-load 'zenburn
-     '(ignore-errors (set-face-background 'mumamo-background-chunk-submode "gray22"))))
+     '(ignore-errors (set-face-background
+                      'mumamo-background-chunk-submode "gray22"))))
+
+;; Platform-specific stuff
+(when (eq system-type 'darwin)
+  ;; Work around a bug on OS X where system-name is FQDN
+  (setq system-name (car (split-string system-name "\\.")))
+  ;; Work around a bug where environment variables aren't set correctly
+  (require 'osx-plist)
+  (when (file-exists-p "~/.MacOSX/environment.plist")
+    (osx-plist-update-environment))))
 
 ;; make emacs use the clipboard
 (setq x-select-enable-clipboard t)
-(setq interprogram-paste-function 'x-cut-buffer-or-selection-value)
 
 (provide 'starter-kit-misc)
 ;;; starter-kit-misc.el ends here