aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-08-16 05:09:18 +0000
committerRichard M. Stallman2006-08-16 05:09:18 +0000
commitc0acb3ee4ce9a7255b060f2ec311ae6b3fda3ce9 (patch)
tree80301dc5b8c18d434645db28ea34f59a8b74a361
parentad47c4a0a50bfb43ff1d29e80fa3edf9b0955249 (diff)
downloademacs-c0acb3ee4ce9a7255b060f2ec311ae6b3fda3ce9.tar.gz
emacs-c0acb3ee4ce9a7255b060f2ec311ae6b3fda3ce9.zip
(x-clipboard-yank): Specify * in interactive spec.
(special-event-map): Process drag-n-drop events this way.
-rw-r--r--lisp/term/x-win.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 38add1538aa..0fc76382130 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2505,7 +2505,7 @@ order until succeed.")
2505;; Override Paste so it looks at CLIPBOARD first. 2505;; Override Paste so it looks at CLIPBOARD first.
2506(defun x-clipboard-yank () 2506(defun x-clipboard-yank ()
2507 "Insert the clipboard contents, or the last stretch of killed text." 2507 "Insert the clipboard contents, or the last stretch of killed text."
2508 (interactive) 2508 (interactive "*")
2509 (let ((clipboard-text (x-selection-value 'CLIPBOARD)) 2509 (let ((clipboard-text (x-selection-value 'CLIPBOARD))
2510 (x-select-enable-clipboard t)) 2510 (x-select-enable-clipboard t))
2511 (if (and clipboard-text (> (length clipboard-text) 0)) 2511 (if (and clipboard-text (> (length clipboard-text) 0))
@@ -2519,7 +2519,7 @@ order until succeed.")
2519 2519
2520;; Initiate drag and drop 2520;; Initiate drag and drop
2521(add-hook 'after-make-frame-functions 'x-dnd-init-frame) 2521(add-hook 'after-make-frame-functions 'x-dnd-init-frame)
2522(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)
2523 2523
2524;; Let F10 do menu bar navigation. 2524;; Let F10 do menu bar navigation.
2525(and (fboundp 'menu-bar-open) 2525(and (fboundp 'menu-bar-open)