# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1283191894 -10800
# Node ID 314f04d4d276cf543bb394785bbcb762dcd8dbd5
# Parent  af3f1edc363f1b2f2697b3141b71ee92c925261a
Fix bug #6944.

 menu-bar.el (menu-bar-edit-menu) <"Paste">: Check selection in
 CLIPBOARD, not in PRIMARY.

diff -r af3f1edc363f -r 314f04d4d276 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Aug 30 17:21:14 2010 +0200
+++ b/lisp/ChangeLog	Mon Aug 30 21:11:34 2010 +0300
@@ -1,3 +1,8 @@
+2010-08-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* menu-bar.el (menu-bar-edit-menu) <"Paste">: Check selection in
+	CLIPBOARD, not in PRIMARY.  (Bug#6944)
+
 2010-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/smie.el (smie-indent-offset-rule): Let :parent take
diff -r af3f1edc363f -r 314f04d4d276 lisp/menu-bar.el
--- a/lisp/menu-bar.el	Mon Aug 30 17:21:14 2010 +0200
+++ b/lisp/menu-bar.el	Mon Aug 30 21:11:34 2010 +0300
@@ -463,7 +463,7 @@
 			    ;; Emacs compiled --without-x doesn't have
 			    ;; x-selection-exists-p.
 			    (and (fboundp 'x-selection-exists-p)
-				 (x-selection-exists-p))
+				 (x-selection-exists-p 'CLIPBOARD))
 			    kill-ring)
 			   (not buffer-read-only))
 	      :help ,(purecopy "Paste (yank) text most recently cut/copied")))