Commit a728dc59 authored by David Reitter's avatar David Reitter
Browse files

(clipboard-yank): avoid checking (x-selection-exists-p) if unbound in

order to enable the item.  For paste menu item, same, and check
kill-ring.
parent 4891ba1d
2009-03-04 David Reitter <david.reitter@gmail.com>
* menu-bar.el (clipboard-yank): avoid
checking (x-selection-exists-p) if unbound in order to enable the
item. For paste menu item, same, and check kill-ring.
2009-03-04 Sam Steingold <sds@gnu.org>
 
* progmodes/compile.el (compilation-error-regexp-alist-alist):
......
......@@ -456,11 +456,13 @@
:help "Choose a string from the kill ring and paste it"))
(define-key menu-bar-edit-menu [paste]
'(menu-item "Paste" yank
: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))
:enable (and (or
;; Emacs compiled --without-x doesn't have
;; x-selection-exists-p.
(and (fboundp 'x-selection-exists-p)
(x-selection-exists-p))
kill-ring)
(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
......@@ -495,10 +497,10 @@
'(and mark-active (not buffer-read-only)))
(put 'clipboard-kill-ring-save 'menu-enable 'mark-active)
(put 'clipboard-yank 'menu-enable
'(and (or (and (fboundp 'x-selection-exists-p)
(x-selection-exists-p))
'(and (or (not (fboundp 'x-selection-exists-p))
(x-selection-exists-p)
(x-selection-exists-p 'CLIPBOARD))
(not buffer-read-only)))
(not buffer-read-only)))
(defun clipboard-yank ()
"Insert the clipboard contents, or the last stretch of killed text."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment