[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/dnd.el,v
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/dnd.el,v |
Date: |
Thu, 07 Sep 2006 07:44:33 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jan Djärv <jhd> 06/09/07 07:44:33
Index: dnd.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dnd.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- dnd.el 20 May 2006 04:28:48 -0000 1.9
+++ dnd.el 7 Sep 2006 07:44:33 -0000 1.10
@@ -34,13 +34,15 @@
;;; Customizable variables
+(eval-when-compile
+ (require 'url-handlers))
;;;###autoload
(defcustom dnd-protocol-alist
- '(
- ("^file:///" . dnd-open-local-file) ; XDND format.
+ '(("^file:///" . dnd-open-local-file) ; XDND format.
("^file://" . dnd-open-file) ; URL with host
("^file:" . dnd-open-local-file) ; Old KDE, Motif, Sun
+ ("^\\(https?\\|ftp\\|file\\|nfs\\)://" . dnd-open-file)
)
"The functions to call for different protocols when a drop is made.
@@ -59,6 +61,22 @@
:group 'dnd)
+(defcustom dnd-open-remote-file-function
+ (if (eq system-type 'windows-nt)
+ 'dnd-open-unc-file
+ 'dnd-open-remote-url)
+ "The function to call when opening a file on a remote machine.
+The function will be called with two arguments; URI and ACTION. See
+`dnd-open-file' for details.
+If nil, then dragging remote files into Emacs will result in an error.
+Predefined functions are `dnd-open-unc-file' and `dnd-open-remote-url'.
+`dnd-open-unc-file' attempts to open the file using its UNC name and is the
+default on MS-Windows. `dnd-open-remote-url' uses `url-handler-mode' and
+is the default except for MS-Windows."
+ :version "22.1"
+ :type 'function
+ :group 'dnd)
+
(defcustom dnd-open-file-other-window nil
"If non-nil, always use find-file-other-window to open dropped files."
@@ -158,6 +176,35 @@
'private)
(error "Can not read %s" uri))))
+(defun dnd-open-unc-file (uri action)
+ "Open a remote file using its unc path.
+The file is opened in the current window, or a new window if
+`dnd-open-file-other-window' is set. URI is the url for the file,
+and must have the format file://hostname/file-name. ACTION is ignored.
+//hostname/file-name is the unc path."
+ (let ((unc-file (if (string-match "^file:" uri)
+ (substring uri 5))))
+ (if (and unc-file (file-readable-p unc-file))
+ (progn
+ (if dnd-open-file-other-window
+ (find-file-other-window unc-file)
+ (find-file unc-file))
+ 'private)
+ (error "Invalid file url"))))
+
+(defun dnd-open-remote-url (uri action)
+ "Open a remote file with `find-file' and `url-handler-mode'.
+Turns `url-handler-mode' on if not on before. The file is opened in the
+current window, or a new window if `dnd-open-file-other-window' is set.
+URI is the url for the file. ACTION is ignored."
+ (progn
+ (or url-handler-mode (url-handler-mode))
+ (if dnd-open-file-other-window
+ (find-file-other-window uri)
+ (find-file uri))
+ 'private))
+
+
(defun dnd-open-file (uri action)
"Open a local or remote file.
The file is opened in the current window, or a new window if
@@ -169,7 +216,9 @@
;; file. Otherwise return nil.
(let ((local-file (dnd-get-local-file-uri uri)))
(if local-file (dnd-open-local-file local-file action)
- (error "Remote files not supported"))))
+ (if dnd-open-remote-file-function
+ (funcall dnd-open-remote-file-function uri action)
+ (error "Remote files not supported")))))
(defun dnd-insert-text (window action text)
- [Emacs-diffs] Changes to emacs/lisp/dnd.el,v,
Jan Djärv <=