* lisp/files.el (cd): Make completion obey cd-path.

* lread.c (Qdir_ok): New constant.
(syms_of_lread): Initialize it.
(openp): Don't ignore directories if the predicate returns dir-ok.

Fixes: debbugs:7924

2 files changed, 19 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 72a9287513d..9839c7fcc98 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (Qdir_ok): New constant.
+        (syms_of_lread): Initialize it.
+        (openp): Don't ignore directories if the predicate returns dir-ok.
+
 2011-02-18  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (display_line): Fix the change made for bug#7939.
diff --git a/src/lread.c b/src/lread.c
index 7e410fcc334..855869cd90d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1250,7 +1250,9 @@ If SUFFIXES is non-nil, it should be a list of suffixes to append to
 file name when searching.
 If non-nil, PREDICATE is used instead of `file-readable-p'.
 PREDICATE can also be an integer to pass to the access(2) function,
-in which case file-name-handlers are ignored.  */)
+in which case file-name-handlers are ignored.
+This function will normally skip directories, so if you want it to find
+directories, make sure the PREDICATE function returns `dir-ok' for them.  */)
   (Lisp_Object filename, Lisp_Object path, Lisp_Object suffixes, Lisp_Object predicate)
 {
   Lisp_Object file;
@@ -1260,6 +1262,7 @@ in which case file-name-handlers are ignored.  */)
   return file;
 }
 
+static Lisp_Object Qdir_ok;
 
 /* Search for a file whose name is STR, looking in directories
    in the Lisp list PATH, and trying suffixes from SUFFIX.
@@ -1377,9 +1380,12 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *sto
               if (NILP (predicate))
                 exists = !NILP (Ffile_readable_p (string));
               else
-                exists = !NILP (call1 (predicate, string));
-              if (exists && !NILP (Ffile_directory_p (string)))
-                exists = 0;
+                {
+                  Lisp_Object tmp = call1 (predicate, string);
+                  exists = !NILP (tmp)
+                    && (EQ (tmp, Qdir_ok)
+                        || !NILP (Ffile_directory_p (string)));
+                }
 
               if (exists)
                 {
@@ -4377,6 +4383,9 @@ to load.  See also `load-dangerous-libraries'.  */);
   Qfile_truename = intern_c_string ("file-truename");
   staticpro (&Qfile_truename) ;
 
+  Qdir_ok = intern_c_string ("dir-ok");
+  staticpro (&Qdir_ok);
+  
   Qdo_after_load_evaluation = intern_c_string ("do-after-load-evaluation");
   staticpro (&Qdo_after_load_evaluation) ;