[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/last-cedet-merge 2b42323 35/50: EDE: Fix for proje
From: |
David Engster |
Subject: |
[Emacs-diffs] scratch/last-cedet-merge 2b42323 35/50: EDE: Fix for project detection |
Date: |
Wed, 25 Jan 2017 22:15:22 +0000 (UTC) |
branch: scratch/last-cedet-merge
commit 2b42323018113a8dae1043a8792cd952b95be941
Author: Edward Steere <address@hidden>
Commit: David Engster <address@hidden>
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 54d48a2..00dbd3d 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.
- [Emacs-diffs] scratch/last-cedet-merge 6d6b045 27/50: EDE: Improve Emacs project type, (continued)
- [Emacs-diffs] scratch/last-cedet-merge 6d6b045 27/50: EDE: Improve Emacs project type, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 64484cf 43/50: semantic: Set `semantic-type-relation-separator-character' for Emacs Lisp, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge e698dc1 04/50: semantic: Add support for typedef references, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 783fb86 46/50: semantic: Add 'fromfile' option to grammar package, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge d2a57bd 50/50: CEDET: Fix "unknown slot [...]" warnings, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge f11e08f 10/50: semantic: Fix wisent parser recursion, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge e4e864a 39/50: semantic: Properly create canonical name for C++ type tag, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 8571383 16/50: semantic: Incorporate local scope when finding type, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge ec4505d 17/50: semantic: Accept FLAGS in texinfo-mode for analyzing completions, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 0a2b38b 26/50: EDE: Expand file name, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 2b42323 35/50: EDE: Fix for project detection,
David Engster <=
- [Emacs-diffs] scratch/last-cedet-merge cfd7139 28/50: semantic: Some C grammar optimizations, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 278c06c 31/50: semantic: Optimize 'typeformbase' in C grammar, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 8daca76 30/50: semantic: C grammar optimizations, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 74263b1 37/50: semantic: Change unary expression rule, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge cfc56f5 38/50: semantic: Fix for db-global, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge ebc8418 40/50: semantic: Check if slot is bound, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge b4bcc84 32/50: semantic: completion fixes, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge b893e8a 41/50: semantic: Allow empty type relation separation character, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 592b5fe 48/50: semantic: Improve C++ 'friend' parsing, David Engster, 2017/01/25
- [Emacs-diffs] scratch/last-cedet-merge 742013b 42/50: semantic: Improve grammar-mode, David Engster, 2017/01/25