diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2014-11-05 12:23:10 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2014-11-05 12:23:10 +0100 |
| commit | 076582fde300472131422818d72e814e516c91ed (patch) | |
| tree | f5beda90d4c1b59d5339ef177f0477c266514e4f /src/dired.c | |
| parent | 58064b4da2835acb24d0f68021c84102e0fb1c0f (diff) | |
| download | emacs-076582fde300472131422818d72e814e516c91ed.tar.gz | |
* dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_name
raises an error.
Fixes: debbugs:18891
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dired.c b/src/dired.c index c2db1f02782..fb536b8a91a 100644 --- 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. */ |