Show
Ignore:
Timestamp:
2006年08月18日 08時35分31秒 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/term/x-win.el

    r4111 r4148  
    25062506(defun x-clipboard-yank () 
    25072507  "Insert the clipboard contents, or the last stretch of killed text." 
    2508   (interactive) 
     2508  (interactive "*") 
    25092509  (let ((clipboard-text (x-selection-value 'CLIPBOARD)) 
    25102510        (x-select-enable-clipboard t)) 
    …… 
    25142514 
    25152515(define-key menu-bar-edit-menu [paste] 
    2516   (cons "Paste" (cons "Paste text from clipboard or kill ring" 
    2517                       'x-clipboard-yank))) 
     2516  '(menu-item "Paste" x-clipboard-yank 
     2517              :enable (not buffer-read-only) 
     2518              :help "Paste (yank) text most recently cut/copied")) 
    25182519 
    25192520;; Initiate drag and drop 
    25202521(add-hook 'after-make-frame-functions 'x-dnd-init-frame) 
    2521 (global-set-key [drag-n-drop] 'x-dnd-handle-drag-n-drop-event) 
     2522(define-key special-event-map [drag-n-drop] 'x-dnd-handle-drag-n-drop-event) 
    25222523 
    25232524;; Let F10 do menu bar navigation.