# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1128368509 0
# Node ID 637dfc9b8d2efbaaff10a4b4f3455c884935012a
# Parent  a9c074731be2c2727b82b291b891c76fbe953af6
* x-dnd.el (x-dnd-drop-data): Don't set dnd-open-file-other-window
to nil if dropping on a window.  Handle dropping on a minibuffer window
like dropping on a non-window part of Emacs.

diff -r a9c074731be2 -r 637dfc9b8d2e lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 03 19:31:29 2005 +0000
+++ b/lisp/ChangeLog	Mon Oct 03 19:41:49 2005 +0000
@@ -1,3 +1,9 @@
+2005-10-03  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* x-dnd.el (x-dnd-drop-data): Don't set dnd-open-file-other-window
+	to nil if dropping on a window.  Handle dropping on a minibuffer window
+	like dropping on a non-window part of Emacs.
+
 2005-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* textmodes/ispell.el (ispell-find-aspell-dictionaries):
diff -r a9c074731be2 -r 637dfc9b8d2e lisp/x-dnd.el
--- a/lisp/x-dnd.el	Mon Oct 03 19:31:29 2005 +0000
+++ b/lisp/x-dnd.el	Mon Oct 03 19:41:49 2005 +0000
@@ -307,10 +307,11 @@
 	 (action (aref state 5))
 	 (w (posn-window (event-start event))))
     (when handler
-      (if (and (windowp w) (window-live-p w))
+      (if (and (windowp w) (window-live-p w)
+	       (not (minibufferp (window-buffer w))))
 	  ;; If dropping in a window, open files in that window rather
 	  ;; than in a new widow.
-	  (let ((dnd-open-file-other-window nil))
+	  (progn
 	    (goto-char (posn-point (event-start event)))
 	    (funcall handler window action data))
 	(let ((dnd-open-file-other-window t))  ;; Dropping on non-window.