Merge from origin/emacs-24

[gnu-emacs] / lisp / cedet / cedet-global.el

diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index b98bd31693501395e46904531bc762067e40949d..99bffcb16b5f208f42ab4c05d8b48b4f1bb23c30 100644 (file)
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -1,6 +1,6 @@
 ;;; cedet-global.el --- GNU Global support for CEDET.
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 ;; Package: cedet
@@ -27,13 +27,19 @@
 (declare-function inversion-check-version "inversion")
 
 (defvar cedet-global-min-version "5.0"
-  "Minimum version of GNU global required.")
+  "Minimum version of GNU Global required.")
 
 (defcustom cedet-global-command "global"
   "Command name for the GNU Global executable."
   :type 'string
   :group 'cedet)
 
+(defcustom cedet-global-gtags-command "gtags"
+  "Command name for the GNU Global gtags executable.
+GTAGS is used to create the tags table queried by the 'global' command."
+  :type 'string
+  :group 'cedet)
+
 ;;; Code:
 (defun cedet-gnu-global-search (searchtext texttype type scope)
   "Perform a search with GNU Global, return the created buffer.
@@ -76,6 +82,26 @@ SCOPE is the scope of the search, such as 'project or 'subdirs."
           flags)
     b))
 
+(defun cedet-gnu-global-gtags-call (flags)
+  "Create GNU Global TAGS using gtags with FLAGS."
+  (let ((b (get-buffer-create "*CEDET Global gtags*"))
+       (cd default-directory)
+       )
+    (with-current-buffer b
+      (setq default-directory cd)
+      (erase-buffer))
+    (apply 'call-process cedet-global-gtags-command
+          nil b nil
+          flags)
+
+    ;; Check for warnings.
+    (with-current-buffer b
+      (goto-char (point-min))
+      (when (re-search-forward "Error\\|Warning" nil t)
+       (error "Output:\n%S" (buffer-string))))
+
+    b))
+
 (defun cedet-gnu-global-expand-filename (filename)
   "Expand the FILENAME with GNU Global.
 Return a fully qualified filename."
@@ -112,8 +138,8 @@ If a default starting DIR is not specified, the current buffer's
 
 (defun cedet-gnu-global-version-check (&optional noerror)
   "Check the version of the installed GNU Global command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if Global isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if Global isn't available,
 return nil."
   (interactive)
   (require 'inversion)
@@ -128,7 +154,7 @@ return nil."
          nil)
       (with-current-buffer b
        (goto-char (point-min))
-       (re-search-forward "GNU GLOBAL \\([0-9.]+\\)" nil t)
+       (re-search-forward "(?GNU GLOBAL)? \\([0-9.]+\\)" nil t)
        (setq rev (match-string 1))
        (if (inversion-check-version rev nil cedet-global-min-version)
            (if noerror
@@ -153,7 +179,20 @@ return nil."
       ;; Return the results
       (nreverse hits))))
 
+(defun cedet-gnu-global-create/update-database (&optional dir)
+  "Create a GNU Global database in DIR.
+If a database already exists, then just update it."
+  (interactive "DDirectory: ")
+  (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.
+        ))
+      )
+    ))
+
 (provide 'cedet-global)
 
-;; arch-tag: 0d0d3ac2-91ef-4820-bb2b-1d59ccf38392
 ;;; cedet-global.el ends here