1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/files.el b/lisp/files.el
index a2289337777..529c3d7bd5b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -300,7 +300,9 @@ If your environment includes a `CDPATH' variable, try each one of that
 colon-separated list of directories when resolving a relative directory name."
   (interactive
    (list (read-file-name "Change default directory: "
-                         default-directory default-directory)))
+                         default-directory default-directory
+                         (and (member cd-path '(nil ("./")))
+                              (null (getenv "CDPATH"))))))
   (if (file-name-absolute-p dir)
       (cd-absolute (expand-file-name dir))
     (if (null cd-path)