Merge from emacs-24; up to 117687

[gnu-emacs] / src / dired.c

diff --git a/src/dired.c b/src/dired.c
index ba6a61a2f5b819c980acc12d944b4f03ece8c9f3..8afba247e6166bda1a1aa9ece53d84f54da92a69 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -909,7 +909,10 @@ so last access time will always be midnight of that day.  */)
   Lisp_Object encoded;
   Lisp_Object handler;
 
-  filename = Fexpand_file_name (filename, Qnil);
+  filename = internal_condition_case_2 (Fexpand_file_name, filename, Qnil,
+                                       Qt, Fidentity);
+  if (!STRINGP (filename))
+    return Qnil;
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */