From: Glenn Morris <rgm@gnu.org>
Date: Mon, 17 Oct 2016 01:56:06 +0000 (-0700)
Subject: * lisp/cus-start.el (exec-path): Handle nil elements.  (Bug#24471)
X-Git-Tag: emacs-25.1.90~116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b73f4668ab685dfb690eced15b20ed47f90efccb;p=emacs.git

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

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))