diff options
| author | Stephen Leake <stephen_leake@stephe-leake.org> | 2015-10-27 10:35:15 -0500 |
|---|---|---|
| committer | Stephen Leake <stephen_leake@stephe-leake.org> | 2015-10-27 10:41:12 -0500 |
| commit | e166a701dd6263f29d9787deaf53d93f27557baa (patch) | |
| tree | d159c487106c3048c319a6a971fdffde6d3fb613 | |
| parent | f72ac3591b10cea65ea0969396995b97a887e571 (diff) | |
Minor CEDET fixes
* lisp/cedet/cedet-global.el (cedet-gnu-global-gtags-call): Handle
warnings from gtags about invalid options.
(cedet-gnu-global-create/update-database): Do incremental update
properly.
* lisp/cedet/ede/generic.el (ede-enable-generic-projects): Get monotone
root right.
| -rw-r--r-- | lisp/cedet/cedet-global.el | 16 | ||||
| -rw-r--r-- | lisp/cedet/ede/generic.el | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el index 3773ba09f3..3ceed5d3b5 100644 --- a/lisp/cedet/cedet-global.el +++ b/lisp/cedet/cedet-global.el @@ -97,7 +97,7 @@ SCOPE is the scope of the search, such as 'project or 'subdirs." ;; Check for warnings. (with-current-buffer b (goto-char (point-min)) - (when (re-search-forward "Error\\|Warning" nil t) + (when (re-search-forward "Error\\|Warning\\|invalid" nil t) (error "Output:\n%S" (buffer-string)))) b)) @@ -186,12 +186,14 @@ If a database already exists, then just update it." (let ((root (cedet-gnu-global-root dir))) (if root (setq dir root)) (let ((default-directory dir)) - (cedet-gnu-global-gtags-call - (when root - '("-u");; Incremental update flag. - )) - ) - )) + (if root + ;; Incremental update. This can be either "gtags -i" or + ;; "global -u"; the gtags manpage says it's better to use + ;; "global -u". + (cedet-gnu-global-call (list "-u")) + (cedet-gnu-global-gtags-call nil) + ) + ))) (provide 'cedet-global) diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el index b865ff5028..d3be545a15 100644 --- a/lisp/cedet/ede/generic.el +++ b/lisp/cedet/ede/generic.el @@ -303,7 +303,7 @@ CLASS is the EIEIO class that is used to track this project. It should subclass (ede-generic-new-autoloader "generic-cvs" "Generic CVS" "CVS" 'ede-generic-vc-project) (ede-generic-new-autoloader "generic-mtn" "Generic Monotone" - "_MTN/options" 'ede-generic-vc-project) + "_MTN" 'ede-generic-vc-project) ;; Take advantage of existing 'projectile' based projects. ;; @TODO - if projectile supports compile commands etc, can we |