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.

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)
 

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