* 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e5d78668cf5554246ec2b28c64a780e149f621e..c9f8ac610ff73aad41809e0893b254c053dab7b0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-03  Jan Dj\e,Ad\e(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 --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 612e033c4cbe00209267c108ec6a6684f8084ff1..4b23665bca2c6abedb953007b023b909f81836dd 100644 (file)
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -307,10 +307,11 @@ nil if not."
         (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.