diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-02-20 07:50:30 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-02-20 07:50:30 -0800 |
| commit | 398afbaf6f31d89b5cb813b75a28b98cf7b1acd2 (patch) | |
| tree | 587f23019db4d4b1a5b138c741dd2895483cbca8 /src/fileio.c | |
| parent | 770f76f050376bbd77a3cc8cf44db57cf855a27c (diff) | |
| parent | 9f0852474810311fd2b26fa3756ab6d816016389 (diff) | |
| download | emacs-398afbaf6f31d89b5cb813b75a28b98cf7b1acd2.tar.gz | |
Merge from origin/emacs-27
9f08524748 (origin/emacs-27) Fix broken regexps
1d10885763 ; spelling and comment fix
614203bc80 ; make change-history-commit
28399e585e * Makefile.in (PREFERRED_BRANCH): Now emacs-27.
62afbc513a Fix bug when visiting euc-jp-encoded directories
a2c4eeeecd Clarify when fixnums are used.
4e5ac4b0c6 Reorder discussion of integer basics
f765aad28b Make OMake support slightly less expensive (bug#39595)
39410cfc5a Speed up 'msft' and 'watcom' compilation error regexps
96a269d045 Speed up 'maven' compilation error message regexp
efc9d4fe3e Amend c-backward-sws better to handle multiline block comm...
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index 87a17eab425..6b56c473abf 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2916,7 +2916,7 @@ See `file-symlink-p' to distinguish symlinks. */) if (!NILP (handler)) return call2 (handler, Qfile_directory_p, absname); - return file_directory_p (absname) ? Qt : Qnil; + return file_directory_p (ENCODE_FILE (absname)) ? Qt : Qnil; } /* Return true if FILE is a directory or a symlink to a directory. |