aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2004-08-31 11:24:10 +0000
committerJan Djärv2004-08-31 11:24:10 +0000
commit7a01b040852e9b361cedf14efca552e5a7fd28ca (patch)
tree15f796d9cd8e5fabc058fa5a757948e99afb8670
parent2aa2f8b8c979787390f8ebf6ebe22fa81bbe7c06 (diff)
downloademacs-7a01b040852e9b361cedf14efca552e5a7fd28ca.tar.gz
emacs-7a01b040852e9b361cedf14efca552e5a7fd28ca.zip
* 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.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/x-dnd.el17
2 files changed, 16 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e6b3e1f60a7..80626c5d2b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12004-08-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * x-dnd.el (x-dnd-protocol-alist): Document update.
4 (x-dnd-known-types): Defcustom it.
5 (x-dnd-handle-motif): Print message-atom in error message.
6
12004-08-30 John Paul Wallington <jpw@gnu.org> 72004-08-30 John Paul Wallington <jpw@gnu.org>
2 8
3 * textmodes/tex-mode.el (tex-validate-buffer): Use distinct 9 * 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'."
58 ) 58 )
59 59
60 "The functions to call for different protocols when a drop is made. 60 "The functions to call for different protocols when a drop is made.
61This variable is used by `x-dnd-handle-uri-list' and `x-dnd-handle-moz-url'. 61This variable is used by `x-dnd-handle-uri-list', `x-dnd-handle-file-name'
62The list contains of (REGEXP . FUNCTION) pairs. 62and `x-dnd-handle-moz-url'. The list contains of (REGEXP . FUNCTION) pairs.
63The functions shall take two arguments, URL, which is the URL dropped and 63The functions shall take two arguments, URL, which is the URL dropped and
64ACTION which is the action to be performed for the drop (move, copy, link, 64ACTION which is the action to be performed for the drop (move, copy, link,
65private or ask). 65private or ask).
@@ -104,9 +104,7 @@ is successful, nil if not."
104 :type 'boolean 104 :type 'boolean
105 :group 'x) 105 :group 'x)
106 106
107;; Internal variables 107(defcustom x-dnd-known-types
108
109(defvar x-dnd-known-types
110 '("text/uri-list" 108 '("text/uri-list"
111 "text/x-moz-url" 109 "text/x-moz-url"
112 "_NETSCAPE_URL" 110 "_NETSCAPE_URL"
@@ -121,7 +119,12 @@ is successful, nil if not."
121 "TEXT" 119 "TEXT"
122 ) 120 )
123 "The types accepted by default for dropped data. 121 "The types accepted by default for dropped data.
124The types are chosen in the order they appear in the list.") 122The types are chosen in the order they appear in the list."
123 :type '(repeat string)
124 :group 'x
125)
126
127;; Internal variables
125 128
126(defvar x-dnd-current-state nil 129(defvar x-dnd-current-state nil
127 "The current state for a drop. 130 "The current state for a drop.
@@ -865,7 +868,7 @@ FORMAT is 32 (not used). MESSAGE is the data part of an XClientMessageEvent."
865 timestamp) 868 timestamp)
866 (x-dnd-forget-drop frame))) 869 (x-dnd-forget-drop frame)))
867 870
868 (t (error "Unknown Motif DND message %s %s" message data))))) 871 (t (error "Unknown Motif DND message %s %s" message-atom data)))))
869 872
870 873
871;;; 874;;;