Mercurial > emacs
comparison lisp/menu-bar.el @ 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 | 280c8ae2476d |
children | 41bf9b6f3b91 |
comparison
equal
deleted
inserted
replaced
110036:af3f1edc363f | 110037:314f04d4d276 |
---|---|
461 `(menu-item ,(purecopy "Paste") yank | 461 `(menu-item ,(purecopy "Paste") yank |
462 :enable (and (or | 462 :enable (and (or |
463 ;; Emacs compiled --without-x doesn't have | 463 ;; Emacs compiled --without-x doesn't have |
464 ;; x-selection-exists-p. | 464 ;; x-selection-exists-p. |
465 (and (fboundp 'x-selection-exists-p) | 465 (and (fboundp 'x-selection-exists-p) |
466 (x-selection-exists-p)) | 466 (x-selection-exists-p 'CLIPBOARD)) |
467 kill-ring) | 467 kill-ring) |
468 (not buffer-read-only)) | 468 (not buffer-read-only)) |
469 :help ,(purecopy "Paste (yank) text most recently cut/copied"))) | 469 :help ,(purecopy "Paste (yank) text most recently cut/copied"))) |
470 (define-key menu-bar-edit-menu [copy] | 470 (define-key menu-bar-edit-menu [copy] |
471 `(menu-item ,(purecopy "Copy") menu-bar-kill-ring-save | 471 `(menu-item ,(purecopy "Copy") menu-bar-kill-ring-save |