Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

[gnu-emacs] / lisp / term / w32-win.el

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index eac43fb70dcd2ca00e3266ff8d308d94261ed577..cbd08e68a392e730173d1fbf0279b438f84da7c0 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -92,7 +92,7 @@
 (declare-function set-message-beep "w32fns.c")
 
 (declare-function cygwin-convert-file-name-from-windows "cygw32.c"
-                  (path &optional absolute_p))
+                 (path &optional absolute_p))
 
 ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
 (if (fboundp 'new-fontset)
@@ -119,7 +119,11 @@
                                    "/")
                      "/")))
                (dnd-handle-one-url window 'private
-                                   (concat "file:" file-name)))
+                                   (concat
+                                    (if (eq system-type 'cygwin)
+                                        "file://"
+                                      "file:")
+                                    file-name)))
 
 (defun w32-drag-n-drop (event &optional new-frame)
   "Edit the files listed in the drag-n-drop EVENT.