mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-03 08:30:09 +00:00
(Ffile_name_all_completions, Ffile_name_completion):
Look for handler for FILE as well as for DIRNAME.
This commit is contained in:
parent
ae4788a82b
commit
8436e23177
16
src/dired.c
16
src/dired.c
@ -236,12 +236,18 @@ Returns nil if DIR contains no name starting with FILE.")
|
||||
{
|
||||
Lisp_Object handler;
|
||||
|
||||
/* If the file name has special constructs in it,
|
||||
/* If the directory name has special constructs in it,
|
||||
call the corresponding file handler. */
|
||||
handler = Ffind_file_name_handler (dirname, Qfile_name_completion);
|
||||
if (!NILP (handler))
|
||||
return call3 (handler, Qfile_name_completion, file, dirname);
|
||||
|
||||
/* If the file name has special constructs in it,
|
||||
call the corresponding file handler. */
|
||||
handler = Ffind_file_name_handler (file, Qfile_name_completion);
|
||||
if (!NILP (handler))
|
||||
return call3 (handler, Qfile_name_completion, file, dirname);
|
||||
|
||||
return file_name_completion (file, dirname, 0, 0);
|
||||
}
|
||||
|
||||
@ -254,12 +260,18 @@ These are all file names in directory DIR which begin with FILE.")
|
||||
{
|
||||
Lisp_Object handler;
|
||||
|
||||
/* If the file name has special constructs in it,
|
||||
/* If the directory name has special constructs in it,
|
||||
call the corresponding file handler. */
|
||||
handler = Ffind_file_name_handler (dirname, Qfile_name_all_completions);
|
||||
if (!NILP (handler))
|
||||
return call3 (handler, Qfile_name_all_completions, file, dirname);
|
||||
|
||||
/* If the file name has special constructs in it,
|
||||
call the corresponding file handler. */
|
||||
handler = Ffind_file_name_handler (file, Qfile_name_all_completions);
|
||||
if (!NILP (handler))
|
||||
return call3 (handler, Qfile_name_all_completions, file, dirname);
|
||||
|
||||
return file_name_completion (file, dirname, 1, 0);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user