Changeset 4166 for trunk/lisp/dnd.el

Timestamp:

09/18/06 20:48:14 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/dnd.el (modified) (4 diffs)

trunk/lisp/dnd.el

@@ -62 +62 @@
-(defcustom dnd-open-remote-file-function
-  (if (eq system-type 'windows-nt)
-unc
+local
-    'dnd-open-remote-url)
-  "The function to call when opening a file on a remote machine.
@@ -68 +68 @@
-`dnd-open-file' for details.
-If nil, then dragging remote files into Emacs will result in an error.
-unc
-unc-file' attempts to open the file using its UNC name and is the 
-
-
+local
+local-file' attempts to open a remote file using its UNC name and
+
+and 
-  :version "22.1"
-  :type 'function
@@ -164 +164 @@
-`dnd-open-file-other-window' is set.  URI is the url for the file,
-and must have the format file:file-name or file:///file-name.
-
+
+
+
+
+
-
-  (let* ((f (dnd-get-local-file-name uri t)))
@@ -174 +178 @@
-          '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)