* x-dnd.el (x-dnd-open-local-file, x-dnd-open-file): Improved error

messages.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28c872ac281248b60340ea7b2cffd37686217d5b..f4d481a83cf7a86692cf6fb501b2761eeb626030 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-19  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * x-dnd.el (x-dnd-open-local-file, x-dnd-open-file): Improved error
+       messages.
+
 2004-04-19  Stephen Eglen  <stephen@gnu.org>
 
        * add-log.el (add-change-log-entry): Update doc string to mention

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index cdb0a63ace616f042e1634a38f0e78cfad2ed9c3..7d43a10556eb597c7f9e2095167f2c1101ff7276 100644 (file)
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -308,14 +308,13 @@ and must have the format file:file-name or file:///file-name.
 The last / in file:/// is part of the file name.  ACTION is ignored."
 
   (let* ((f (x-dnd-get-local-file-name uri t)))
-    (when f
-      (if (file-readable-p f)
-         (progn
-           (if x-dnd-open-file-other-window
-               (find-file-other-window f)
-             (find-file f))
-           'private)
-       (error "Can not read %s (%s)" f uri)))))
+    (if (and f (file-readable-p f))
+       (progn
+         (if x-dnd-open-file-other-window
+             (find-file-other-window f)
+           (find-file f))
+         'private)
+      (error "Can not read %s" uri))))
 
 (defun x-dnd-open-file (uri action)
   "Open a local or remote file.
@@ -327,7 +326,8 @@ The last / in file://hostname/ is part of the file name."
   ;; The hostname may be our hostname, in that case, convert to a local
   ;; file.  Otherwise return nil.
   (let ((local-file (x-dnd-get-local-file-uri uri)))
-    (when local-file (x-dnd-open-local-file local-file action))))
+    (if local-file (x-dnd-open-local-file local-file action)
+      (error "Remote files not supported"))))
 
 
 (defun x-dnd-handle-moz-url (window action data)