From 0bf5b69147b9fe07ea590fcebfab8ac369545692 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Wed, 28 Dec 2011 09:53:56 +0900
Subject: [PATCH] changes for darwin

---
 .bashrc   | 3 ++-
 .emacs.el | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.bashrc b/.bashrc
index adeb3c3..06ac5f8 100755
--- a/.bashrc
+++ b/.bashrc
@@ -399,9 +399,10 @@ echo "Japanese letters are 表示可能"
 
 safe-cmd diskinfo
 
-type xrandr >/dev/null 2>&1 && {
+isdarwin || type xrandr >/dev/null 2>&1 && {
     xrandr | grep --color=never ^Screen
 }
+
 iswindows || safe-cmd finger $USER
 LANG=C safe-cmd id
 
diff --git a/.emacs.el b/.emacs.el
index 0a7cdd7..75896cd 100644
--- a/.emacs.el
+++ b/.emacs.el
@@ -579,8 +579,9 @@ return nil if LIB unfound and downloading failed, otherwise the path of LIB."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; share clipboard with x
-(when (or window-system
+(when (and window-system
           ;; (getenv "DESKTOP_SESSION")
+          (not (eq window-system 'mac))
           )
   (setq x-select-enable-clipboard t     ; these settings seems to be useless when using emacs in terminal
         x-select-enable-primary nil)
@@ -1312,7 +1313,10 @@ otherwise, use `pack-default-extension' for pack."
                (not (get-buffer-window bf)))
       (kill-buffer bf))))
 
-(setq dired-listing-switches "-lhFG --time-style=long-iso")
+(if (eq window-system 'mac)
+    (setq dired-listing-switches "-lhFG")
+  (setq dired-listing-switches "-lhFG --time-style=long-iso")
+  )
 (define-minor-mode my-dired-display-all-mode
   ""
   :init-value nil