diff --git a/.bashrc b/.bashrc index 356581e..d2b93cb 100755 --- a/.bashrc +++ b/.bashrc @@ -84,7 +84,7 @@ gitls(){ done } catclip(){ - if iscygwin + if iswindows then cat /dev/clipboard | tr -d \\r else @@ -92,7 +92,7 @@ catclip(){ fi } setclip(){ - if iscygwin + if iswindows then if test $# -eq 0 then diff --git a/.emacs.el b/.emacs.el index 911f851..49ae664 100644 --- a/.emacs.el +++ b/.emacs.el @@ -710,12 +710,13 @@ return nil if LIB unfound and downloading failed, otherwise the path of LIB." (add-hook (kill-local-variable 'before-save-hook) 'js2-before-save))) -(when (require 'zone nil t) - ;; (zone-when-idle 180) - (run-with-idle-timer 180 t (lambda () - (unless (memq major-mode - '(term-mode)) - (zone))))) +(and (require 'zone nil t) + (not (eq system-type 'windows-nt)) + ;; (zone-when-idle 180) + (run-with-idle-timer 180 t (lambda () + (unless (memq major-mode + '(term-mode)) + (zone))))) (when (require 'uniquify nil t) (setq uniquify-buffer-name-style 'post-forward-angle-brackets)