From: Steve Youngs Date: Thu, 16 Jan 2014 13:58:16 +0000 (+1000) Subject: XEmacs compatibility fix in #'directory-files (Closes Bug 163) X-Git-Tag: v22.1.16~52^2 X-Git-Url: https://cgit.sxemacs.org/?p=sxemacs;a=commitdiff_plain;h=4c568a08815692f48a7f9ff5559ee759d1da2e9e XEmacs compatibility fix in #'directory-files (Closes Bug 163) For details see: http://issues.sxemacs.org/show_bug.cgi?id=163 * src/dired.c (directory_files_resultify): Return an unsorted list when RESULT-TYPE is `non-nil' or `list'. * src/dired.c (Fdirectory_files): Update doc string. Signed-off-by: Steve Youngs --- diff --git a/src/dired.c b/src/dired.c index fd942a5..8cec22b 100644 --- a/src/dired.c +++ b/src/dired.c @@ -581,7 +581,7 @@ directory_files_resultify(Lisp_Object result, Lisp_Object result_type) } else if (EQ(result_type, Qdesc_sorted_list)) { final_result = Fdllist_to_list(result); final_result = Fsort(final_result, Qstring_greaterp); - } else if (EQ(result_type, Qt) || EQ(result_type, Qlist)) { + } else if (!NILP(result_type) || EQ(result_type, Qlist)) { final_result = Fdllist_to_list(result); } @@ -634,6 +634,10 @@ Optional argument RESULT-TYPE can be one of: The two latter types can be useful if you plan to sort the result yourself, or want to feed the result to further processing. +For compatibility with XEmacs' NOSORT argument to this function, +RESULT-TYPE can also be any non-nil value. In that case it will +return an unsorted list. (http://issues.sxemacs.org/show_bug.cgi?id=163) + Optional argument FILES-ONLY can be one of: - t to return only files and symlinks in DIRECTORY - nil (default) to return all entries (files, symlinks, and