aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1992-12-12 15:35:12 +0000
committerJim Blandy1992-12-12 15:35:12 +0000
commit997bf68d0a06c48d671e0d2d810ec070c4dba78b (patch)
tree991d87a892761c11ffb05ec3f68282299150e8fc
parent4a88b3b0fef8489fb3edc99a7659ec93da89130e (diff)
downloademacs-997bf68d0a06c48d671e0d2d810ec070c4dba78b.tar.gz
emacs-997bf68d0a06c48d671e0d2d810ec070c4dba78b.zip
* fileio.c (find_file_handler): Rename this to
Ffind_file_name_handler, and make it visible to lisp. Add a QUIT to the loop which scans file-name-handler-alist. All uses changed. (syms_of_fileio): Mention this new function in the docstring for Vfile_name_handler_alist. defsubr Sfind_file_name_handler. * lisp.h (Ffind_file_name_handler): Added extern declaration. * dired.c: All uses of find_file_handler changed here too.
-rw-r--r--src/dired.c10
-rw-r--r--src/lisp.h1
2 files changed, 6 insertions, 5 deletions
diff --git a/src/dired.c b/src/dired.c
index bfc1bf062b9..5be150ef002 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -67,7 +67,7 @@ extern struct direct *readdir ();
67#define lstat stat 67#define lstat stat
68#endif 68#endif
69 69
70extern Lisp_Object find_file_handler (); 70extern Lisp_Object Ffind_file_name_handler ();
71 71
72Lisp_Object Vcompletion_ignored_extensions; 72Lisp_Object Vcompletion_ignored_extensions;
73 73
@@ -95,7 +95,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.\n\
95 95
96 /* If the file name has special constructs in it, 96 /* If the file name has special constructs in it,
97 call the corresponding file handler. */ 97 call the corresponding file handler. */
98 handler = find_file_handler (dirname); 98 handler = Ffind_file_name_handler (dirname);
99 if (!NILP (handler)) 99 if (!NILP (handler))
100 { 100 {
101 Lisp_Object args[6]; 101 Lisp_Object args[6];
@@ -199,7 +199,7 @@ Returns nil if DIR contains no name starting with FILE.")
199 199
200 /* If the file name has special constructs in it, 200 /* If the file name has special constructs in it,
201 call the corresponding file handler. */ 201 call the corresponding file handler. */
202 handler = find_file_handler (dirname); 202 handler = Ffind_file_name_handler (dirname);
203 if (!NILP (handler)) 203 if (!NILP (handler))
204 return call3 (handler, Qfile_name_completion, file, dirname); 204 return call3 (handler, Qfile_name_completion, file, dirname);
205 205
@@ -217,7 +217,7 @@ These are all file names in directory DIR which begin with FILE.")
217 217
218 /* If the file name has special constructs in it, 218 /* If the file name has special constructs in it,
219 call the corresponding file handler. */ 219 call the corresponding file handler. */
220 handler = find_file_handler (dirname); 220 handler = Ffind_file_name_handler (dirname);
221 if (!NILP (handler)) 221 if (!NILP (handler))
222 return call3 (handler, Qfile_name_all_completions, file, dirname); 222 return call3 (handler, Qfile_name_all_completions, file, dirname);
223 223
@@ -489,7 +489,7 @@ If file does not exist, returns nil.")
489 489
490 /* If the file name has special constructs in it, 490 /* If the file name has special constructs in it,
491 call the corresponding file handler. */ 491 call the corresponding file handler. */
492 handler = find_file_handler (filename); 492 handler = Ffind_file_name_handler (filename);
493 if (!NILP (handler)) 493 if (!NILP (handler))
494 return call2 (handler, Qfile_attributes, filename); 494 return call2 (handler, Qfile_attributes, filename);
495 495
diff --git a/src/lisp.h b/src/lisp.h
index d355837067b..6e38d8cba78 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1070,6 +1070,7 @@ extern Lisp_Object Fcopy_marker ();
1070/* Defined in fileio.c */ 1070/* Defined in fileio.c */
1071 1071
1072extern Lisp_Object Qfile_error; 1072extern Lisp_Object Qfile_error;
1073extern Lisp_Object Ffind_file_name_handler ();
1073extern Lisp_Object Ffile_name_as_directory (); 1074extern Lisp_Object Ffile_name_as_directory ();
1074extern Lisp_Object Fexpand_file_name (), Ffile_name_nondirectory (); 1075extern Lisp_Object Fexpand_file_name (), Ffile_name_nondirectory ();
1075extern Lisp_Object Fsubstitute_in_file_name (); 1076extern Lisp_Object Fsubstitute_in_file_name ();