From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 30 Aug 2010 18:11:34 +0000 (+0300)
Subject: Fix bug #6944.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~203
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=42b6a73bc70429b7997fa18986a72341f98840f8;p=emacs.git

Fix bug #6944.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69b11bd7a9a..65ec210f8ef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 64c39f644a7..6149fea4769 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -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")))