diff options
| author | Daniel Colascione <dancol@dancol.org> | 2012-11-15 15:31:37 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2012-11-15 15:31:37 -0800 |
| commit | 9533048d4a8e86dd6a8ffc8970afce28fda2632f (patch) | |
| tree | f6a43cb6e0e347be1859c5e60b311f05dfe8a457 /lisp | |
| parent | b72c161c5bda1836b0a86ceba1bd968abd00ff1a (diff) | |
| parent | faeafc0133e90bdd6e1df134e507201d6e3c7a38 (diff) | |
| download | emacs-9533048d4a8e86dd6a8ffc8970afce28fda2632f.tar.gz | |
Merge from cygw32 branch
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b86e03b42af..6dd2399844c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index ad6e1125027..224fb7c1442 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -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. |