summaryrefslogtreecommitdiff
path: root/lisp/x-dnd.el
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2005-10-03 19:41:49 +0000
committerJan Djärv <jan.h.d@swipnet.se>2005-10-03 19:41:49 +0000
commit03714c7f0986a62aeaa1390d3125c064fbcef45e (patch)
tree7604d13fd94f0136814c14c94012b49ec1522780 /lisp/x-dnd.el
parent9a49a36bdbdbef7dad75721cc65564150a03fa14 (diff)
downloademacs-03714c7f0986a62aeaa1390d3125c064fbcef45e.tar.gz
* 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.
Diffstat (limited to 'lisp/x-dnd.el')
-rw-r--r--lisp/x-dnd.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 612e033c4cb..4b23665bca2 100644
--- 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.