* cus-start.el: Avoid x-select-enable-clipboard-manager warning on non-X platforms.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aef9e5480559c7f2b31885c1a3bee447d8656cdc..da2783ede461f14ea9734368d27c4bb79a6fe307 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-07  Chong Yidong  <cyd@gnu.org>
+
+       * cus-start.el: Avoid x-select-enable-clipboard-manager warning on
+       non-X platforms.
+
 2012-03-06  Glenn Morris  <rgm@gnu.org>
 
        * term/pc-win.el (x-selection-owner-p, x-own-selection-internal)

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index a2ac7aa91e6a55d2a3bf026b0f93061838203f8b..fbba49951d13ae4dc390d195b5e5e4313fe06b1e 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -502,6 +502,8 @@ since it could result in memory overflow and make Emacs crash."
                       (featurep 'ns))
                      ((string-match "\\`x-.*gtk" (symbol-name symbol))
                       (featurep 'gtk))
+                     ((string-match "clipboard-manager" (symbol-name symbol))
+                      (boundp 'x-select-enable-clipboard-manager))
                      ((string-match "\\`x-" (symbol-name symbol))
                       (fboundp 'x-create-frame))
                      ((string-match "selection" (symbol-name symbol))