* lisp/cus-start.el (exec-path): Handle nil elements. (Bug#24471)

1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 001d638ca14..a8bcc458649 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -173,7 +173,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                         (directory :format "%v")))
                         nil
                         :standard
-                        (mapcar 'directory-file-name
+                        (mapcar (lambda (f)
+                                  (if f (directory-file-name f)
+                                    "."))
                                 (append (parse-colon-path (getenv "PATH"))
                                         (list exec-directory))))
              (exec-suffixes execute (repeat string))