diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-10-10 07:50:18 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-10-10 07:50:18 -0700 |
| commit | 950911373c7e3a7527748b377935f4bfff694fe8 (patch) | |
| tree | 1b2a244998f2285c4e571885e3741df67783c8c1 /lisp/term | |
| parent | 1006eb119849e4f81aa9a0b1c214a72bc2fbf8e3 (diff) | |
| parent | acc9b461538d65190cd88f87fd997f733f382ad9 (diff) | |
| download | emacs-950911373c7e3a7527748b377935f4bfff694fe8.tar.gz | |
Merge from origin/emacs-27
acc9b46153 Fix merging of region face for non-ASCII characters
c2a13969e4 Make drag and drop on NS open all URLs (bug#43470)
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) |