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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 735357439ab20aa628a81a938c870830d2854c66..c1edff57656185670c890afa6ebb2dbfad2e2955 100644 (file)
--- 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 a5032cf99e74b6caaf33fa4697ee81442517de73..a2ac7aa91e6a55d2a3bf026b0f93061838203f8b 100644 (file)
--- 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