Fix bug #12914 with drag-n-drop in native MS-Windows build.

 lisp/term/w32-win.el (w32-handle-dropped-file): Use 'file://' only on
 Cygwin; otherwise use 'file:'.
 (cygwin-convert-path-from-windows): Declare, to avoid
 byte-compiler warnings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8da19539c9ae7fa87bc28b84e3f10060b0af20e4..135ee569aa4a873c428a9c8cc6390043d59ab721 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-17  Eli Zaretskii  <eliz@gnu.org>
+
+       * term/w32-win.el (w32-handle-dropped-file): Use 'file://' only on
+       Cygwin; otherwise use 'file:'.  (Bug#12914)
+       (cygwin-convert-path-from-windows): Declare, to avoid
+       byte-compiler warnings.
+
 2012-11-17  Andreas Politz  <politza@fh-trier.de>
 
        * ibuffer.el (ibuffer-mark-forward, ibuffer-unmark-forward)

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 224fb7c14423a8b8d53a0577da589b14f96c1286..80bc647c2f72a9275f9c2fd3e599fd86a836287f 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -91,6 +91,9 @@
 (declare-function w32-send-sys-command "w32fns.c")
 (declare-function set-message-beep "w32fns.c")
 
+(declare-function cygwin-convert-path-from-windows "cygw32.c"
+                 (path absolute_p))
+
 ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
 (if (fboundp 'new-fontset)
     (require 'fontset))
@@ -116,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.