aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2005-10-03 19:31:29 +0000
committerJan Djärv2005-10-03 19:31:29 +0000
commit9a49a36bdbdbef7dad75721cc65564150a03fa14 (patch)
tree51c3c65e5b582b73dd88c97eb75b9aa77de20a61
parent1430e7f9b956cb3eff5e0ad6b53f8f27178bda77 (diff)
downloademacs-9a49a36bdbdbef7dad75721cc65564150a03fa14.tar.gz
emacs-9a49a36bdbdbef7dad75721cc65564150a03fa14.zip
* frames.texi (Drag and Drop): Remove the x- from
x-dnd-open-file-other-window and xdnd-protocol-alist.
-rw-r--r--man/ChangeLog5
-rw-r--r--man/frames.texi8
2 files changed, 9 insertions, 4 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 3e1d6732f0f..8d9db429ca6 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
12005-10-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * frames.texi (Drag and Drop): Remove the x- from
4 x-dnd-open-file-other-window and xdnd-protocol-alist.
5
12005-09-30 Romain Francoise <romain@orebokech.com> 62005-09-30 Romain Francoise <romain@orebokech.com>
2 7
3 * mini.texi (Minibuffer): The default value now appears before the 8 * mini.texi (Minibuffer): The default value now appears before the
diff --git a/man/frames.texi b/man/frames.texi
index 8e058867fcd..2928aa7a62a 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -857,10 +857,10 @@ case, dropping the file on a Dired buffer moves or copies the file
857(according to the conventions of the application it came from) into the 857(according to the conventions of the application it came from) into the
858directory displayed in that buffer. 858directory displayed in that buffer.
859 859
860@vindex x-dnd-open-file-other-window 860@vindex dnd-open-file-other-window
861 Dropping a file normally visits it in the window you drop it on. If 861 Dropping a file normally visits it in the window you drop it on. If
862you prefer to visit the file in a new window in such cases, customize 862you prefer to visit the file in a new window in such cases, customize
863the variable @code{x-dnd-open-file-other-window}. 863the variable @code{dnd-open-file-other-window}.
864 864
865@ignore 865@ignore
866@c ??? To Lisp manual 866@c ??? To Lisp manual
@@ -881,10 +881,10 @@ or add a new type, customize @code{x-dnd-types-alist}. This requires
881detailed knowledge of what types other applications use for drag and 881detailed knowledge of what types other applications use for drag and
882drop. 882drop.
883 883
884@vindex x-dnd-protocol-alist 884@vindex dnd-protocol-alist
885 When an URL is dropped on Emacs it may be a file, but it may also be 885 When an URL is dropped on Emacs it may be a file, but it may also be
886another URL type (ftp, http, etc.). Emacs first checks 886another URL type (ftp, http, etc.). Emacs first checks
887@code{x-dnd-protocol-alist} to determine what to do with the URL. If 887@code{dnd-protocol-alist} to determine what to do with the URL. If
888there is no match there and if @code{browse-url-browser-function} is 888there is no match there and if @code{browse-url-browser-function} is
889an alist, Emacs looks for a match there. If no match is found the 889an alist, Emacs looks for a match there. If no match is found the
890text for the URL is inserted. If you want to alter Emacs behavior, 890text for the URL is inserted. If you want to alter Emacs behavior,