Commit 076582fd authored by Michael Albinus's avatar Michael Albinus
Browse files

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

raises an error.

Fixes: debbugs:18891
parent 58064b4d
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.
......
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment