From: Jan Djärv Date: Tue, 31 Aug 2004 11:24:10 +0000 (+0000) Subject: * x-dnd.el (x-dnd-protocol-alist): Document update. X-Git-Tag: ttn-vms-21-2-B4~5132 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a01b040852e9b361cedf14efca552e5a7fd28ca;p=emacs.git * x-dnd.el (x-dnd-protocol-alist): Document update. (x-dnd-known-types): Defcustom it. (x-dnd-handle-motif): Print message-atom in error message. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e6b3e1f60a7..80626c5d2b7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2004-08-31 Jan Dj,Ad(Brv + + * x-dnd.el (x-dnd-protocol-alist): Document update. + (x-dnd-known-types): Defcustom it. + (x-dnd-handle-motif): Print message-atom in error message. + 2004-08-30 John Paul Wallington * textmodes/tex-mode.el (tex-validate-buffer): Use distinct diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index 7d43a10556e..0f9237f3409 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -58,8 +58,8 @@ The default value for this variable is `x-dnd-default-test-function'." ) "The functions to call for different protocols when a drop is made. -This variable is used by `x-dnd-handle-uri-list' and `x-dnd-handle-moz-url'. -The list contains of (REGEXP . FUNCTION) pairs. +This variable is used by `x-dnd-handle-uri-list', `x-dnd-handle-file-name' +and `x-dnd-handle-moz-url'. The list contains of (REGEXP . FUNCTION) pairs. The functions shall take two arguments, URL, which is the URL dropped and ACTION which is the action to be performed for the drop (move, copy, link, private or ask). @@ -104,9 +104,7 @@ is successful, nil if not." :type 'boolean :group 'x) -;; Internal variables - -(defvar x-dnd-known-types +(defcustom x-dnd-known-types '("text/uri-list" "text/x-moz-url" "_NETSCAPE_URL" @@ -121,7 +119,12 @@ is successful, nil if not." "TEXT" ) "The types accepted by default for dropped data. -The types are chosen in the order they appear in the list.") +The types are chosen in the order they appear in the list." + :type '(repeat string) + :group 'x +) + +;; Internal variables (defvar x-dnd-current-state nil "The current state for a drop. @@ -865,7 +868,7 @@ FORMAT is 32 (not used). MESSAGE is the data part of an XClientMessageEvent." timestamp) (x-dnd-forget-drop frame))) - (t (error "Unknown Motif DND message %s %s" message data))))) + (t (error "Unknown Motif DND message %s %s" message-atom data))))) ;;;