[Emacs-diffs] /srv/bzr/emacs/trunk r110908: Merge from cygw32 branch

[Daniel Colascione]

------------------------------------------------------------
revno: 110908 [merge]
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-15 15:31:37 -0800
message:
  Merge from cygw32 branch
modified:
  lisp/ChangeLog
  lisp/term/w32-win.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-15 04:42:14 +0000
+++ b/lisp/ChangeLog    2012-11-15 23:31:37 +0000
@@ -1,3 +1,10 @@
+2012-11-15  Daniel Colascione  <address@hidden>
+
+       * term/w32-win.el (w32-handle-dropped-file): Use a "file://"
+       prefix instead of "file:" so that when FILE-NAME begins with "//",
+       as it does when the target file is on a network share, url-handler
+       isn't confused.
+
 2012-11-15  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/advice.el (ad-definition-type): Make sure we don't use

=== modified file 'lisp/term/w32-win.el'
--- a/lisp/term/w32-win.el      2012-10-09 07:08:26 +0000
+++ b/lisp/term/w32-win.el      2012-11-15 23:28:27 +0000
@@ -116,7 +116,7 @@
                                    "/")
                      "/")))
                (dnd-handle-one-url window 'private
-                                   (concat "file:" file-name)))
+                                   (concat "file://" file-name)))
 
 (defun w32-drag-n-drop (event &optional new-frame)
   "Edit the files listed in the drag-n-drop EVENT.