From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 22 Aug 2006 06:14:45 +0000 (+0000)
Subject: * x-dnd.el (x-dnd-drop-data): Don't call goto-char if
X-Git-Tag: emacs-pretest-22.0.90~918
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1867217a61f67cb32ea9e1808daa313b9fad21df;p=emacs.git

* x-dnd.el (x-dnd-drop-data): Don't call goto-char if
 mouse-yank-at-point is non-nil.
---

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.