Pass operation to Ffind_file_name_handler.

4 files changed, 7 insertions, 10 deletions

diff --git a/lisp/diff.el b/lisp/diff.el
index 8de44211ffd..891fb970449 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -254,7 +254,7 @@ The backup file is the first file given to `diff'."
 
 (defun diff-latest-backup-file (fn)	; actually belongs into files.el
   "Return the latest existing backup of FILE, or nil."
-  (let ((handler (find-file-name-handler fn)))
+  (let ((handler (find-file-name-handler fn 'diff-latest-backup-file)))
     (if handler
 	(funcall handler 'diff-latest-backup-file fn)
       ;; First try simple backup, then the highest numbered of the
diff --git a/src/buffer.c b/src/buffer.c
index c9623cd4347..e7353d6c5bc 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -196,7 +196,7 @@ If there is no such live buffer, return nil.")
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
-  handler = Ffind_file_name_handler (filename);
+  handler = Ffind_file_name_handler (filename, Qget_file_buffer);
   if (!NILP (handler))
     return call2 (handler, Qget_file_buffer, filename);
 
diff --git a/src/dired.c b/src/dired.c
index 6362aa95364..d8b9683514f 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -94,12 +94,9 @@ extern struct re_pattern_buffer searchbuf;
 
 extern int completion_ignore_case;
 extern Lisp_Object Vcompletion_regexp_list;
-extern Lisp_Object Ffind_file_name_handler ();
 
 Lisp_Object Vcompletion_ignored_extensions;
-
 Lisp_Object Qcompletion_ignore_case;
-
 Lisp_Object Qdirectory_files;
 Lisp_Object Qfile_name_completion;
 Lisp_Object Qfile_name_all_completions;
@@ -122,7 +119,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.\n\
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
-  handler = Ffind_file_name_handler (dirname);
+  handler = Ffind_file_name_handler (dirname, Qdirectory_files);
   if (!NILP (handler))
     {
       Lisp_Object args[6];
@@ -246,7 +243,7 @@ Returns nil if DIR contains no name starting with FILE.")
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
-  handler = Ffind_file_name_handler (dirname);
+  handler = Ffind_file_name_handler (dirname, Qfile_name_completion);
   if (!NILP (handler))
     return call3 (handler, Qfile_name_completion, file, dirname);
 
@@ -264,7 +261,7 @@ These are all file names in directory DIR which begin with FILE.")
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
-  handler = Ffind_file_name_handler (dirname);
+  handler = Ffind_file_name_handler (dirname, Qfile_name_all_completions);
   if (!NILP (handler))
     return call3 (handler, Qfile_name_all_completions, file, dirname);
 
@@ -594,7 +591,7 @@ If file does not exist, returns nil.")
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
-  handler = Ffind_file_name_handler (filename);
+  handler = Ffind_file_name_handler (filename, Qfile_attributes);
   if (!NILP (handler))
     return call2 (handler, Qfile_attributes, filename);
 
diff --git a/src/lread.c b/src/lread.c
index c5185eebb00..bf6b1f4a2ba 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -350,7 +350,7 @@ Return t if file exists.")
   str = Fsubstitute_in_file_name (str);
 
   /* If file name is magic, call the handler.  */
-  handler = Ffind_file_name_handler (str);
+  handler = Ffind_file_name_handler (str, Qload);
   if (!NILP (handler))
     return call5 (handler, Qload, str, noerror, nomessage, nosuffix);