2 files changed, 16 insertions, 0 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 8af5062c7e7..d0fc0026eb1 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * frames.texi (Drag and drop): Add documentation about
+        x-dnd-test-function and x-dnd-known-types.
+
 2004-08-30  Luc Teirlinck  <teirllm@auburn.edu>
 
         * indent.texi: Various minor changes in addition to:
diff --git a/man/frames.texi b/man/frames.texi
index 50b6a4ed398..dee050922e6 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -809,6 +809,17 @@ As a special case, if a file is dropped on a dired buffer the file is
 copied or moved (depends on exactly how it is dragged and the application
 it was dragged from) to the directory the dired buffer is displaying.
 
+@vindex x-dnd-test-function
+@vindex x-dnd-known-types
+  When a user drags something from another application over Emacs, that other
+application expects Emacs to tell it if Emacs can handle the data that is
+dragged.  The variable @code{x-dnd-test-function} is used by Emacs to determine
+what to reply.  The default value is @code{x-dnd-default-test-function}
+which accepts drops if the type of the data to be dropped is present in
+@code{x-dnd-known-types}.  You can customize @code{x-dnd-test-function} and/or
+@code{x-dnd-known-types} if you want Emacs to accept or reject drops based
+on some other criteria.
+
 @vindex x-dnd-open-file-other-window
   A file is normally opened in the window it is dropped on, but if you
 prefer the file to be opened in a new window you can customize the variable