lisp/*.el: Lexical-binding cleanup.

[bpt/emacs.git] / lisp / x-dnd.el

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index b12cb6c..1c6af1f 100644 (file)
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -145,7 +145,7 @@ any protocol specific data.")
   "Return the state in `x-dnd-current-state' for a frame or window."
   (cdr (x-dnd-get-state-cons-for-frame frame-or-window)))
 
-(defun x-dnd-default-test-function (window action types)
+(defun x-dnd-default-test-function (_window _action types)
   "The default test function for drag and drop.
 WINDOW is where the mouse is when this function is called.  It may be
 a frame if the mouse is over the menu bar, scroll bar or tool bar.
@@ -225,8 +225,7 @@ DATA is encoded in utf-16.  Decode the URL and call `x-dnd-handle-uri-list'."
         (string (decode-coding-string data coding))
         (strings (split-string string "[\r\n]" t))
         ;; Can one drop more than one moz-url ??  Assume not.
-        (url (car strings))
-        (title (car (cdr strings))))
+        (url (car strings)))
     (x-dnd-handle-uri-list window action url)))
 
 (defun x-dnd-insert-utf8-text (window action text)
@@ -361,7 +360,7 @@ Currently XDND, Motif and old KDE 1.x protocols are recognized."
 (declare-function x-window-property "xfns.c"
                  (prop &optional frame type source delete-p vector-ret-p))
 
-(defun x-dnd-handle-old-kde (event frame window message format data)
+(defun x-dnd-handle-old-kde (_event frame window _message _format _data)
   "Open the files in a KDE 1.x drop."
   (let ((values (x-window-property "DndSelection" frame nil 0 t)))
     (x-dnd-handle-uri-list window 'private
@@ -434,7 +433,7 @@ otherwise return the frame coordinates."
 (declare-function x-get-selection-internal "xselect.c"
                  (selection-symbol target-type &optional time-stamp))
 
-(defun x-dnd-handle-xdnd (event frame window message format data)
+(defun x-dnd-handle-xdnd (event frame window message _format data)
   "Receive one XDND event (client message) and send the appropriate reply.
 EVENT is the client message.  FRAME is where the mouse is now.
 WINDOW is the window within FRAME where the mouse is now.
@@ -456,11 +455,8 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
                          (x-get-atom-name (aref data 4))))))))
 
        ((equal "XdndPosition" message)
-        (let* ((x (car (aref data 2)))
-               (y (cdr (aref data 2)))
-               (action (x-get-atom-name (aref data 4)))
+        (let* ((action (x-get-atom-name (aref data 4)))
                (dnd-source (aref data 0))
-               (dnd-time (aref data 3))
                (action-type (x-dnd-maybe-call-test-function
                              window
                              (cdr (assoc action x-dnd-xdnd-to-action))))
@@ -491,7 +487,7 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
                            (x-get-selection-internal
                             'XdndSelection
                             (intern (x-dnd-current-type window)))))
-               success action ret-action)
+               success action)
 
           (setq action (if value
                            (condition-case info
@@ -502,11 +498,6 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
                               nil))))
 
           (setq success (if action 1 0))
-          (setq ret-action
-                (if (eq success 1)
-                    (or (car (rassoc action x-dnd-xdnd-to-action))
-                        "XdndActionPrivate")
-                  0))
 
           (x-send-client-message
            frame dnd-source frame "XdndFinished" 32
@@ -591,7 +582,7 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
     (2 . private)) ; Motif does not have private, so use copy for private.
   "Mapping from number to operation for Motif DND.")
 
-(defun x-dnd-handle-motif (event frame window message-atom format data)
+(defun x-dnd-handle-motif (event frame window message-atom _format data)
   (let* ((message-type (cdr (assoc (aref data 0) x-dnd-motif-message-types)))
         (source-byteorder (aref data 1))
         (my-byteorder (byteorder))