diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-10-14 11:04:55 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-10-14 11:04:55 +0200 |
| commit | f8505fd3d43dd95492855eac88922b5b27201e7a (patch) | |
| tree | 5e2de987d295fb3a34e52ea7930265351ce45f2b /lisp/term | |
| parent | 03e98f93f72c8a158a3584355bca174e2c63dce6 (diff) | |
| parent | b13e0c1501a21e942692718194c634e01a13928a (diff) | |
| download | emacs-f8505fd3d43dd95492855eac88922b5b27201e7a.tar.gz | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/ns-win.el | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index dd0a986572d..cc7a3762b4a 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -511,15 +511,9 @@ string dropped into the current buffer." (set-frame-selected-window nil window) (raise-frame) (setq window (selected-window)) - (cond ((memq 'ns-drag-operation-generic operations) - ;; Perform the default action for the type. - (if (eq type 'file) - (dolist (data objects) - (dnd-handle-one-url window 'private (concat "file:" data))) - (dnd-insert-text window 'private string))) - ((memq 'ns-drag-operation-copy operations) - ;; Try to open the file/URL. If type is nil, try to open - ;; it as a URL anyway. + (cond ((or (memq 'ns-drag-operation-generic operations) + (memq 'ns-drag-operation-copy operations)) + ;; Perform the default/copy action. (dolist (data objects) (dnd-handle-one-url window 'private (if (eq type 'file) (concat "file:" data) |