[Emacs-diffs] /srv/bzr/emacs/trunk r110926: Fix bug #12914 with drag-n-drop in native MS-Windows build.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110926
fixes bug: http://debbugs.gnu.org/12914
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-17 22:41:21 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/term/w32-win.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-17 07:15:23 +0000
+++ b/lisp/ChangeLog    2012-11-17 20:41:21 +0000
@@ -1,3 +1,10 @@
+2012-11-17  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * ibuffer.el (ibuffer-mark-forward, ibuffer-unmark-forward)

=== modified file 'lisp/term/w32-win.el'
--- a/lisp/term/w32-win.el      2012-11-15 23:28:27 +0000
+++ b/lisp/term/w32-win.el      2012-11-17 20:41:21 +0000
@@ -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.