]> git.eshelyaron.com Git - emacs.git/commitdiff
EDE: Fix for project detection
authorEdward Steere <edward.steere@gmail.com>
Sun, 13 Mar 2016 15:28:21 +0000 (11:28 -0400)
committerDavid Engster <deng@randomsample.de>
Sun, 22 Jan 2017 21:25:16 +0000 (22:25 +0100)
* 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

index 54d48a205000bd31cb31150532e86d36a6bec6e6..00dbd3d68fb8424951838838deef9a6f89c6d5f1 100644 (file)
@@ -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.