*** menu-bar.el.~1.296.~	Sun Nov 19 18:04:18 2006
--- menu-bar.el	Sun Dec  3 11:00:30 2006
***************
*** 502,512 ****
  ;; These are alternative definitions for the cut, paste and copy
  ;; menu items.  Use them if your system expects these to use the clipboard.

! (put 'clipboard-kill-region 'menu-enable 'mark-active)
  (put 'clipboard-kill-ring-save 'menu-enable 'mark-active)
  (put 'clipboard-yank 'menu-enable
!      '(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."
--- 502,515 ----
  ;; These are alternative definitions for the cut, paste and copy
  ;; menu items.  Use them if your system expects these to use the clipboard.

! (put 'clipboard-kill-region 'menu-enable
!      '(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))
! 	       (x-selection-exists-p 'CLIPBOARD))
! 	   (not buffer-read-only)))

  (defun clipboard-yank ()
    "Insert the clipboard contents, or the last stretch of killed text."