aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2006-09-07 10:12:51 +0000
committerJan Djärv2006-09-07 10:12:51 +0000
commit1df4d4a85f86404cf69c4155289b925c23a652c0 (patch)
treecd613046453e7271d1186816ef00ced7910c2765
parenteaf6d473fb4cfdb39f9e0bcdd3514b5382f93d84 (diff)
downloademacs-1df4d4a85f86404cf69c4155289b925c23a652c0.tar.gz
emacs-1df4d4a85f86404cf69c4155289b925c23a652c0.zip
* dnd.el: Fix bootstrapping
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/dnd.el3
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2dcffc46a3a..7cd30f5be2e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,8 @@
12006-09-07 Jan Dj,Ad(Brv <Janjan.h.d@swipnet.se> 12006-09-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * dnd.el: Fix bootstrapping.
4
52006-09-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 6
3 * dnd.el (dnd-protocol-alist): Add what url-handler-mode can handle. 7 * dnd.el (dnd-protocol-alist): Add what url-handler-mode can handle.
4 (dnd-open-remote-url): New function. 8 (dnd-open-remote-url): New function.
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 18a98957032..f1e1c6b1b9e 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -34,8 +34,6 @@
34 34
35;;; Customizable variables 35;;; Customizable variables
36 36
37(eval-when-compile
38 (require 'url-handlers))
39 37
40;;;###autoload 38;;;###autoload
41(defcustom dnd-protocol-alist 39(defcustom dnd-protocol-alist
@@ -198,6 +196,7 @@ Turns `url-handler-mode' on if not on before. The file is opened in the
198current window, or a new window if `dnd-open-file-other-window' is set. 196current window, or a new window if `dnd-open-file-other-window' is set.
199URI is the url for the file. ACTION is ignored." 197URI is the url for the file. ACTION is ignored."
200 (progn 198 (progn
199 (require 'url-handlers)
201 (or url-handler-mode (url-handler-mode)) 200 (or url-handler-mode (url-handler-mode))
202 (if dnd-open-file-other-window 201 (if dnd-open-file-other-window
203 (find-file-other-window uri) 202 (find-file-other-window uri)