* x-dnd.el (x-dnd-drop-data): Don't call goto-char if

 mouse-yank-at-point is non-nil.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22137ebccf2..b4407a951a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-22 Jorgen Schaefer <forcer@forcix.cx> (tiny change)
+
+        * x-dnd.el (x-dnd-drop-data): Don't call goto-char if
+        mouse-yank-at-point is non-nil.
+
 2006-08-22  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-frame-memory-buffer): Make frame
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 81fe9a8e868..c229b0868e4 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -325,7 +325,8 @@ nil if not."
           ;; If dropping in an ordinary window which we could use,
           ;; let dnd-open-file-other-window specify what to do.
           (progn
-            (goto-char (posn-point (event-start event)))
+            (when (not mouse-yank-at-point)
+              (goto-char (posn-point (event-start event))))
             (funcall handler window action data))
         ;; If we can't display the file here,
         ;; make a new window for it.