diff --git a/.bashrc b/.bashrc index f9ead92..b41ec85 100755 --- a/.bashrc +++ b/.bashrc @@ -405,9 +405,10 @@ echo "Japanese letters are 表示可能" safe-cmd diskinfo -test -n "${DESKTOP_SESSION}" && type xrandr >/dev/null 2>&1 && { +! isdarwin && test -n "${DESKTOP_SESSION}" && type xrandr >/dev/null 2>&1 && { xrandr | grep --color=never ^Screen } -iswindows || safe-cmd finger $USER + +! iswindows && safe-cmd finger $USER LANG=C safe-cmd id diff --git a/.emacs.el b/.emacs.el index d8bc1c3..39f319a 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) @@ -1323,7 +1324,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