diff options
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/w32-win.el | 6 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index f43d8b235d1..1ffab849406 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -76,6 +76,7 @@ (require 'faces) (require 'select) (require 'menu-bar) +(require 'x-dnd) ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles (if (fboundp 'new-fontset) (require 'fontset)) @@ -105,7 +106,10 @@ Switch to a buffer editing the last file dropped." (y (cdr coords))) (if (and (> x 0) (> y 0)) (set-frame-selected-window nil window)) - (mapcar 'find-file (car (cdr (cdr event))))) + (mapcar (lambda (file-name) + (x-dnd-handle-one-url window 'private + (concat "file:" file-name))) + (car (cdr (cdr event))))) (raise-frame))) (defun w32-drag-n-drop-other-frame (event) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index cd26352a962..381ee606300 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -2334,7 +2334,10 @@ order until succeed.") (defun x-clipboard-yank () "Insert the clipboard contents, or the last stretch of killed text." (interactive) - (let ((clipboard-text (x-get-selection 'CLIPBOARD)) + (let ((clipboard-text + (condition-case nil + (x-get-selection 'CLIPBOARD) + (error nil))) (x-select-enable-clipboard t)) (if (and clipboard-text (> (length clipboard-text) 0)) (kill-new clipboard-text)) |