* dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_name

raises an error.

Fixes: debbugs:18891

diff --git a/src/ChangeLog b/src/ChangeLog
index f30cad15f02648b7f315d98ebbead7e03b1d9fe8..f7088fce56336a6b4ab17ef04b65da474d90ef74 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-05  Michael Albinus  <michael.albinus@gmx.de>
+
+       * dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_name
+       raises an error.  (Bug#18891)
+
 2014-11-03  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (Fdump_glyph_matrix, Fdump_frame_glyph_matrix): Doc fix.

diff --git a/src/dired.c b/src/dired.c
index c2db1f02782bceb9b5c8bf573cf8f78cf3b8ab2a..fb536b8a91aca0a19a762abe08b1243ee9a3910a 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.  */