Properly respond to drops observing the Motif protocol

* lisp/pgtk-dnd.el (pgtk-dnd-handle-file-name):

* lisp/x-dnd.el (x-dnd-handle-file-name): Correct order of
arguments to d-h-m-u.

diff --git a/lisp/pgtk-dnd.el b/lisp/pgtk-dnd.el
index 2ce1571aefc26985cfd96f125083cb7293ff6a49..48edaa2472a8d61e1ab4a733df1532a38b1320db 100644 (file)
--- a/lisp/pgtk-dnd.el
+++ b/lisp/pgtk-dnd.el
@@ -253,16 +253,17 @@ STRING is the file names as a string, separated by nulls."
        retval)
     (let ((did-action
            (dnd-handle-multiple-urls
-            window action (mapcar
-                           (lambda (item)
-                             (when coding
-                               (setq item (encode-coding-string item
-                                                                coding)))
-                             (concat "file://"
-                                     (mapconcat 'url-hexify-string
-                                                (split-string item "/")
-                                                "/")))
-                           uri-list))))
+            window (mapcar
+                    (lambda (item)
+                      (when coding
+                        (setq item (encode-coding-string item
+                                                         coding)))
+                      (concat "file://"
+                              (mapconcat 'url-hexify-string
+                                         (split-string item "/")
+                                         "/")))
+                    uri-list)
+            action)))
       (when did-action (setq retval did-action)))
     retval))
 

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index eca1e93ba0799fff449a9e030fe6b5a446fccc4c..cf7f61b39a7d8517c550c99949c4c11ae9bcd80c 100644 (file)
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -384,16 +384,18 @@ STRING is the file names as a string, separated by nulls."
        retval)
     (let ((did-action
            (dnd-handle-multiple-urls
-            window action (mapcar
-                           (lambda (item)
-                             (when coding
-                               (setq item (encode-coding-string item
-                                                                coding)))
-                             (concat "file://"
-                                     (mapconcat 'url-hexify-string
-                                                (split-string item "/")
-                                                "/")))
-                           uri-list))))
+            window
+            (mapcar
+             (lambda (item)
+               (when coding
+                 (setq item (encode-coding-string item
+                                                  coding)))
+               (concat "file://"
+                       (mapconcat 'url-hexify-string
+                                  (split-string item "/")
+                                  "/")))
+             uri-list)
+            action)))
       (when did-action (setq retval did-action)))
     retval))