[Emacs-diffs] /srv/bzr/emacs/trunk r101224: Fix bug #6944.

[Eli Zaretskii]

------------------------------------------------------------
revno: 101224
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-30 21:11:34 +0300
message:
  Fix bug #6944.
  
   menu-bar.el (menu-bar-edit-menu) <"Paste">: Check selection in
   CLIPBOARD, not in PRIMARY.
modified:
  lisp/ChangeLog
  lisp/menu-bar.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-30 15:21:14 +0000
+++ b/lisp/ChangeLog    2010-08-30 18:11:34 +0000
@@ -1,3 +1,8 @@
+2010-08-30  Eli Zaretskii  <address@hidden>
+
+       * menu-bar.el (menu-bar-edit-menu) <"Paste">: Check selection in
+       CLIPBOARD, not in PRIMARY.  (Bug#6944)
+
 2010-08-30  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/smie.el (smie-indent-offset-rule): Let :parent take

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2010-08-29 16:17:13 +0000
+++ b/lisp/menu-bar.el  2010-08-30 18:11:34 +0000
@@ -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")))