<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -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 &quot;\\.&quot;))))
-
 ;; You can keep system- or user-specific customizations here
 (setq system-specific-config (concat dotfiles-dir system-name &quot;.el&quot;)
       user-specific-config (concat dotfiles-dir user-login-name &quot;.el&quot;)</diff>
      <filename>init.el</filename>
    </modified>
    <modified>
      <diff>@@ -118,11 +118,20 @@
 
 (eval-after-load 'mumamo
   '(eval-after-load 'zenburn
-     '(ignore-errors (set-face-background 'mumamo-background-chunk-submode &quot;gray22&quot;))))
+     '(ignore-errors (set-face-background
+                      'mumamo-background-chunk-submode &quot;gray22&quot;))))
+
+;; 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 &quot;\\.&quot;)))
+  ;; Work around a bug where environment variables aren't set correctly
+  (require 'osx-plist)
+  (when (file-exists-p &quot;~/.MacOSX/environment.plist&quot;)
+    (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
\ No newline at end of file</diff>
      <filename>starter-kit-misc.el</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>eeb133dde1fd0dc859cbbd116fe3ee09f2f073be</id>
    </parent>
  </parents>
  <author>
    <name>Phil Hagelberg</name>
    <email>technomancy@gmail.com</email>
  </author>
  <url>http://github.com/technomancy/emacs-starter-kit/commit/3a9d81bf287e56dcd13c19ba2e28f74b4a00c3c5</url>
  <id>3a9d81bf287e56dcd13c19ba2e28f74b4a00c3c5</id>
  <committed-date>2009-10-09T12:34:36-07:00</committed-date>
  <authored-date>2009-10-09T12:34:36-07:00</authored-date>
  <message>Load environment from a *shudder* plist.xml file on OS X.

Move platform-specific code to starter-kit-misc.el.</message>
  <tree>a0879d3bf0e29198a7e9b8385d5a32f1dbb9dd21</tree>
  <committer>
    <name>Phil Hagelberg</name>
    <email>technomancy@gmail.com</email>
  </committer>
</commit>
