diff options
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8da19539c9a..135ee569aa4 100644 --- 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 224fb7c1442..80bc647c2f7 100644 --- 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. |