From: Leo Liu <sdl.web@gmail.com>
Date: Sun, 3 Oct 2010 01:27:39 +0000 (-0400)
Subject: Fix return value of dnd-get-local-file-name (Bug#7090).
X-Git-Tag: emacs-pretest-23.2.90~87^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=83b8ea28ea1d3f9f7c73af717fefaaeca18a1594;p=emacs.git

Fix return value of dnd-get-local-file-name (Bug#7090).

* lisp/dnd.el (dnd-get-local-file-name): If MUST-EXIST is non-nil, only
return non-nil if the file exists (Bug#7090).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 696941f93cd..acc2e0c382f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-03  Leo  <sdl.web@gmail.com>
+
+	* dnd.el (dnd-get-local-file-name): If MUST-EXIST is non-nil, only
+	return non-nil if the file exists (Bug#7090).
+
 2010-09-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* minibuffer.el (completion--replace):
diff --git a/lisp/dnd.el b/lisp/dnd.el
index d7cbb641bab..aadfad6d7ac 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -154,10 +154,11 @@ Return nil if URI is not a local file."
       (let* ((decoded-f (decode-coding-string
 			 f
 			 (or file-name-coding-system
-			     default-file-name-coding-system)))
-	     (try-f (if (file-readable-p decoded-f) decoded-f f)))
-	(when (file-readable-p try-f) try-f)))))
-
+			     default-file-name-coding-system))))
+	(setq f (cond ((file-readable-p decoded-f) decoded-f)
+		      ((file-readable-p f) f)
+		      (t nil)))))
+    f))
 
 (defun dnd-open-local-file (uri action)
   "Open a local file.