mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

(menu-bar-edit-menu): Don't use x-selection-exists-p if

Browse Source 
it is not fboundp.
(clipboard-yank): Ditto.
This commit is contained in:
Eli Zaretskii 2001-11-11 14:02:54 +00:00
parent 91e51f9a78
commit 721c26b86b
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2001-11-11 Eli Zaretskii <eliz@is.elta.co.il>
* menu-bar.el (menu-bar-edit-menu): Don't use x-selection-exists-p if
it is not fboundp.
(clipboard-yank): Ditto.
2001-11-11 Colin Walters <walters@verbum.org>
The following changes are based on patches from

9
lisp/menu-bar.el
View File

@ -398,7 +398,11 @@ A large number or nil slows down menu responsiveness."
:help "Paste (yank) text cut or copied earlier"))
(define-key menu-bar-edit-menu [paste]
'(menu-item "Paste" yank
:enable (and (x-selection-exists-p) (not buffer-read-only))
:enable (and
;; Emacs compiled --without-x doesn't have
;; x-selection-exists-p.
(fboundp 'x-selection-exists-p)
(x-selection-exists-p) (not buffer-read-only))
:help "Paste (yank) text most recently cut/copied"))
(define-key menu-bar-edit-menu [copy]
'(menu-item "Copy" menu-bar-kill-ring-save
@ -433,7 +437,8 @@ A large number or nil slows down menu responsiveness."
(put 'clipboard-kill-region 'menu-enable 'mark-active)
(put 'clipboard-kill-ring-save 'menu-enable 'mark-active)
(put 'clipboard-yank 'menu-enable
'(or (x-selection-exists-p) (x-selection-exists-p 'CLIPBOARD)))
'(or (and (fboundp 'x-selection-exists-p) (x-selection-exists-p))
(x-selection-exists-p 'CLIPBOARD)))
(defun clipboard-yank ()
"Insert the clipboard contents, or the last stretch of killed text."