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 69b11bd7a9a93437a034e6f488304090c5903590..65ec210f8ef2a53a8059f0e190018ab7dc5294d3 100644 (file)
--- 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 64c39f644a7de31c3788e7a664729b2635db3253..6149fea4769c2592c97ce702e4cb98b34a6c831c 100644 (file)
--- 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")))