(x-clipboard-yank): Specify * in interactive spec.

(special-event-map): Process drag-n-drop events this way.

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 38add1538aaebd7f920064f5bec70b9f159f6e1a..0fc7638213025c83fa2519d1691331ec046191f6 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2505,7 +2505,7 @@ order until succeed.")
 ;; Override Paste so it looks at CLIPBOARD first.
 (defun x-clipboard-yank ()
   "Insert the clipboard contents, or the last stretch of killed text."
-  (interactive)
+  (interactive "*")
   (let ((clipboard-text (x-selection-value 'CLIPBOARD))
        (x-select-enable-clipboard t))
     (if (and clipboard-text (> (length clipboard-text) 0))
@@ -2519,7 +2519,7 @@ order until succeed.")
 
 ;; Initiate drag and drop
 (add-hook 'after-make-frame-functions 'x-dnd-init-frame)
-(global-set-key [drag-n-drop] 'x-dnd-handle-drag-n-drop-event)
+(define-key special-event-map [drag-n-drop] 'x-dnd-handle-drag-n-drop-event)
 
 ;; Let F10 do menu bar navigation.
 (and (fboundp 'menu-bar-open)