From: Chong Yidong <cyd@gnu.org>
Date: Wed, 7 Mar 2012 05:53:51 +0000 (+0800)
Subject: * cus-start.el: Avoid x-select-enable-clipboard-manager warning on non-X platforms.
X-Git-Tag: emacs-pretest-24.0.05~149
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=78e8b10a3ec05a2e067489465cc325ef48ad4945;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aef9e548055..da2783ede46 100644
--- 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 a2ac7aa91e6..fbba49951d1 100644
--- 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))