changeset 12984:7c38c6da4aae

(Ffile_name_all_completions, Ffile_name_completion): Look for handler for FILE as well as for DIRNAME.
author Richard M. Stallman <rms@gnu.org>
date Sat, 02 Sep 1995 01:19:53 +0000
parents ed39ba26313b
children 3adacdaa1d3f
files src/dired.c
diffstat 1 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/dired.c	Fri Sep 01 18:43:30 1995 +0000
+++ b/src/dired.c	Sat Sep 02 01:19:53 1995 +0000
@@ -236,9 +236,15 @@
 {
   Lisp_Object handler;
 
+  /* 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 (dirname, Qfile_name_completion);
+  handler = Ffind_file_name_handler (file, Qfile_name_completion);
   if (!NILP (handler))
     return call3 (handler, Qfile_name_completion, file, dirname);
 
@@ -254,9 +260,15 @@
 {
   Lisp_Object handler;
 
+  /* 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 (dirname, Qfile_name_all_completions);
+  handler = Ffind_file_name_handler (file, Qfile_name_all_completions);
   if (!NILP (handler))
     return call3 (handler, Qfile_name_all_completions, file, dirname);