2 files changed, 31 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8054a5dd76..9d589c693a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2006-05-20  Masayuki FUJII  <boochang@m4.kcn.ne.jp>  (tiny change)
+
+        * dnd.el (dnd-get-local-file-name): Specify LITERAL in
+        replace-regexp-in-string.
+
+        * term/w32-win.el (w32-drag-n-drop): Substitute '/' for '\',
+        encode, and escape file name on conversion to URL.
+
+2006-05-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dnd.el (dnd-handle-one-url): Change 3rd arg ARG to URL.  Don't
+        unescape URL.
+        (dnd-get-local-file-name): Unescape URL on conversion to file name.
+
+        * x-dnd.el (x-dnd-handle-file-name): Encode and escape file names
+        on conversion to URLs.
+
+        * net/browse-url.el (browse-url-file-url): Encode file name on
+        conversion to URL.
+
+        * term/mac-win.el (mac-ae-open-documents): Escape file name on
+        conversion to URL.
+
 2006-05-19  Eli Zaretskii  <eliz@gnu.org>
 
         * progmodes/cc-styles.el (c-style-alist): Doc fix.
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 3987ad66f6a..31a794eeaa1 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -112,6 +112,14 @@ Switch to a buffer editing the last file dropped."
       (if (and (> x 0) (> y 0))
           (set-frame-selected-window nil window))
       (mapcar (lambda (file-name)
+                (let ((f (subst-char-in-string ?\\ ?/ file-name))
+                      (coding (or file-name-coding-system
+                                  default-file-name-coding-system)))
+                  (setq file-name
+                        (mapconcat 'url-hexify-string
+                                   (split-string (encode-coding-string f coding)
+                                                 "/")
+                                   "/")))
                 (dnd-handle-one-url window 'private
                                     (concat "file:" file-name)))
                 (car (cdr (cdr event)))))