Remove SYMLINK-IS-FILE argument

[sxemacs] / src / dired.c

diff --git a/src/dired.c b/src/dired.c
index 5469ef6..a6a4cf9 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -612,10 +612,9 @@ call9(Lisp_Object fn,
 \f
 EXFUN(Fdirectory_files_recur, 8);
 
-DEFUN("directory-files", Fdirectory_files, 1, 7, 0,    /*
+DEFUN("directory-files", Fdirectory_files, 1, 5, 0,    /*
 Return a list of names of files in DIRECTORY.
 Args are DIRECTORY &optional FULL MATCH RESULT-TYPE FILES_ONLY
-SYMLINK_IS_FILE BLOOM_FILTER
 
 There are four optional arguments:
 FULL can be one of:
@@ -651,30 +650,21 @@ Optional argument FILES-ONLY can be one of:
   subdirectories) in DIRECTORY
 - subdir  to return only subdirectories -- but *NOT* symlinks to
   directories -- in DIRECTORY
-
-Optional argument SYMLINK-IS-FILE specifies whether symlinks
-should be resolved \(which is the default behaviour\) or whether
-they are treated as ordinary files \(non-nil\), in the latter
-case symlinks to directories are not recurred.
-
-Optional argument BLOOM-FILTER specifies a bloom filter where
-to put results in addition to the ordinary result list.
 */
-      (directory, full, match, result_type, files_only,
-       symlink_is_file, bloom_filter))
+      (directory, full, match, result_type, files_only))
 {
        Lisp_Object handler = Qnil;
        Lisp_Object result = Qnil;
 #if !defined HAVE_BDWGC || !defined EF_USE_BDWGC
        /* just a convenience array for gc pro'ing */
-       Lisp_Object args[8] = {
+       Lisp_Object args[6] = {
                directory, match, result_type, files_only,
-               symlink_is_file, bloom_filter, handler, result};
+               handler, result};
 #endif /* !BDWGC */
        struct dfr_options_s opts = {
                .maxdepth = 0,
                .fullp = !NILP(full),
-               .symlink_file_p = !NILP(symlink_is_file),
+               .symlink_file_p = 0,
                .matchfullp = EQ(full,Qmatch_full),
        };
        struct gcpro gcpro1;
@@ -691,13 +681,12 @@ to put results in addition to the ordinary result list.
        handler = Ffind_file_name_handler(directory, Qdirectory_files);
        if (!NILP(handler)) {
                UNGCPRO;
-               return call8(handler, Qdirectory_files,
-                            directory, full, match, result_type, files_only,
-                            symlink_is_file, bloom_filter);
+               return call6(handler, Qdirectory_files,
+                            directory, full, match, result_type, files_only);
        }
 
        result = directory_files_magic(directory, match,
-                                      files_only, bloom_filter,
+                                      files_only, Qnil /* bloom_filter */,
                                       &opts);
 
        UNGCPRO;