[Emacs-diffs] Changes to emacs/lisp/x-dnd.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/x-dnd.el
diff -c emacs/lisp/x-dnd.el:1.8.2.1 emacs/lisp/x-dnd.el:1.8.2.2
*** emacs/lisp/x-dnd.el:1.8.2.1 Fri Apr 16 12:50:11 2004
--- emacs/lisp/x-dnd.el Mon Jun 28 07:28:48 2004
***************
*** 308,321 ****
  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)))))
  
  (defun x-dnd-open-file (uri action)
    "Open a local or remote file.
--- 308,320 ----
  The last / in file:/// is part of the file name.  ACTION is ignored."
  
    (let* ((f (x-dnd-get-local-file-name uri t)))
!     (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,333 ****
    ;; 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))))
  
  
  (defun x-dnd-handle-moz-url (window action data)
--- 326,333 ----
    ;; 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)))
!     (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)