Merge from emacs--rel--22

[gnu-emacs] / lisp / term / mac-win.el

diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index c8f26edff3749d38e4f60a9ac7d0514737d4ca83..60f27052892edf6a259b3743a64cb207275145df 100644 (file)
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -2197,7 +2197,9 @@ either in the current buffer or in the echo area."
 (defun mac-service-open-file ()
   "Open the file specified by the selection value for Services."
   (interactive)
-  (find-file-existing (x-selection-value mac-service-selection)))
+  ;; The selection seems not to contain the file name as
+  ;; public.utf16-plain-text data on Mac OS X 10.4.
+  (dnd-open-file (x-get-selection mac-service-selection 'public.file-url) nil))
 
 (defun mac-service-open-selection ()
   "Create a new buffer containing the selection value for Services."