From: Chong Yidong <cyd@gnu.org>
Date: Sun, 4 Mar 2012 06:55:06 +0000 (+0800)
Subject: * cus-start.el: Make x-select-enable-clipboard-manager customizable.
X-Git-Tag: emacs-pretest-24.0.05~176
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c1ca42b4fb3ed80ed6f31d689af6847ab3139c26;p=emacs.git

* cus-start.el: Make x-select-enable-clipboard-manager customizable.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 735357439ab..c1edff57656 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-04  Chong Yidong  <cyd@gnu.org>
+
+	* cus-start.el: Make x-select-enable-clipboard-manager
+	customizable.
+
 2012-03-04  Glenn Morris  <rgm@gnu.org>
 
 	* abbrev.el (copy-abbrev-table, abbrev-table-p)
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index a5032cf99e7..a2ac7aa91e6 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -460,6 +460,8 @@ since it could result in memory overflow and make Emacs crash."
 	     (x-use-underline-position-properties display boolean "22.1")
 	     (x-underline-at-descent-line display boolean "22.1")
 	     (x-stretch-cursor display boolean "21.1")
+	     ;; xselect.c
+	     (x-select-enable-clipboard-manager killing boolean "24.1")
 	     ;; xsettings.c
 	     (font-use-system-font font-selection boolean "23.2")))
       this symbol group type standard version native-p rest prop propval