diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-08 10:21:38 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-08 10:21:38 -0800 |
| commit | 416148257afedb97bbe6d732eea3a0c72473dab0 (patch) | |
| tree | 959013e867de73a5ad27e013a1637119833e7856 /src/dired.c | |
| parent | 97cd730164baf67617e1031730105523315c068f (diff) | |
| parent | 86b1c771e14efcc98f8fe07510a4238bf94ced7b (diff) | |
| download | emacs-416148257afedb97bbe6d732eea3a0c72473dab0.tar.gz | |
Merge from emacs-24; up to 117687
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 ba6a61a2f5b..8afba247e61 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. */ |