Mercurial > emacs
changeset 110037:314f04d4d276
Fix bug #6944.
menu-bar.el (menu-bar-edit-menu) <"Paste">: Check selection in
CLIPBOARD, not in PRIMARY.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Mon, 30 Aug 2010 21:11:34 +0300 |
| parents | af3f1edc363f |
| children | 6939db1ee97b |
| files | lisp/ChangeLog lisp/menu-bar.el |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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")))