From 721c26b86bcf5d0ea5b43315547634ef8079a12d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 11 Nov 2001 14:02:54 +0000 Subject: [PATCH] (menu-bar-edit-menu): Don't use x-selection-exists-p if it is not fboundp. (clipboard-yank): Ditto. --- lisp/ChangeLog | 6 ++++++ lisp/menu-bar.el | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2a395e7876e..9ca5f0f5e90 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2001-11-11 Eli Zaretskii + + * 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 The following changes are based on patches from diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 6a9da349a17..5d169aaea2b 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -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."