From 2b42323018113a8dae1043a8792cd952b95be941 Mon Sep 17 00:00:00 2001 From: Edward Steere Date: Sun, 13 Mar 2016 11:28:21 -0400 Subject: [PATCH] EDE: Fix for project detection * lisp/cedet/ede/detect.el (ede--detect-ldf-root-predicate): Make sure updir is not nil before trying to detect it. Copyright-paperwork-exempt: yes --- lisp/cedet/ede/detect.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/cedet/ede/detect.el b/lisp/cedet/ede/detect.el index 54d48a20500..00dbd3d68fb 100644 --- a/lisp/cedet/ede/detect.el +++ b/lisp/cedet/ede/detect.el @@ -143,7 +143,8 @@ Return a cons cell: ;; If it didn't change, then obviously this must be the top. t ;; If it is different, check updir for the file. - (not (ede-auto-detect-in-dir ede--detect-nomatch-auto updir)))))) + (or (null updir) + (not (ede-auto-detect-in-dir ede--detect-nomatch-auto updir))))))) (defun ede--detect-scan-directory-for-project-root (directory auto) "If DIRECTORY has already been detected with AUTO, find the root. -- 2.39.5