Merge from cygw32 branch

This commit is contained in:
Daniel Colascione 2012-11-15 15:31:37 -08:00
commit 9533048d4a
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,10 @@
2012-11-15 Daniel Colascione <dancol@dancol.org>
* 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 <monnier@iro.umontreal.ca>
* emacs-lisp/advice.el (ad-definition-type): Make sure we don't use

View file

@ -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.