From ea0f98e8e3b713b75b6d9d47725658911696f8f6 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Tue, 12 Jun 2012 23:18:24 +0900
Subject: [PATCH] fix xclip prefs

---
 emacs.el | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/emacs.el b/emacs.el
index 4b34a82..8c49eb9 100644
--- a/emacs.el
+++ b/emacs.el
@@ -537,17 +537,11 @@ Return nil if library unfound and failed to download, otherwise the path where t
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; share clipboard with x
 
-;; this page describes this in details, but only these sexps are needed
+;; this page describes this in details, but only these sexps seem to be needed
 ;; http://garin.jp/doc/Linux/xwindow_clipboard
-(when (and window-system
-           (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)
-  ;; (global-set-key "\C-y" 'x-clipboard-yank)
-  )
 
-(and (not x-select-enable-clipboard)
+(and (not window-system)
+     (not (eq window-system 'mac))
      (getenv "DISPLAY")
      (executable-find "xclip")
      ;; (< emacs-major-version 24)