(w32-drag-n-drop): Load files in current window, if

drop coords aren't over a specific window.

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 5067b46d15ba560b66b7cf849bff796eadcecac1..a46f2334e9ef842766670971ba164ee2121344cb 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -156,9 +156,17 @@
 Switch to a buffer editing the last file dropped."
   (interactive "e")
   (save-excursion
-    (set-frame-selected-window nil (posn-window (event-start event)))
-    (mapcar 'find-file (car (cdr (cdr event)))))
-  (raise-frame))
+    ;; Make sure the drop target has positive co-ords
+    ;; before setting the selected frame - otherwise it
+    ;; won't work.  <skx@tardis.ed.ac.uk>
+    (let* ((window (posn-window (event-start event)))
+          (coords (posn-x-y (event-start event)))
+          (x (car coords))
+          (y (cdr coords)))
+      (if (and (> x 0) (> y 0))
+         (set-frame-selected-window nil window))
+      (mapcar 'find-file (car (cdr (cdr event)))))
+  (raise-frame)))
 
 (defun w32-drag-n-drop-other-frame (event)
   "Edit the files listed in the drag-n-drop event, in other frames.