Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

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

diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el
index bfd97fc5a5491809929ac6c35f2c9f1981cbab7d..7f3d616203e581660ffd43e94f8f146a2e2863c2 100644 (file)
--- a/lisp/cedet/semantic/db-global.el
+++ b/lisp/cedet/semantic/db-global.el
@@ -1,7 +1,6 @@
 ;;; semantic/db-global.el --- Semantic database extensions for GLOBAL
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2002-2006, 2008-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
@@ -66,7 +65,7 @@ in a GNU Global supported hierarchy."
   )
 
 (defun semanticdb-enable-gnu-global-hook ()
-  "Add support for GNU Global in the current buffer via semantic-init-hook.
+  "Add support for GNU Global in the current buffer via `semantic-init-hook'.
 MODE is the major mode to support."
   (semanticdb-enable-gnu-global-in-buffer t))
 
@@ -78,8 +77,8 @@ MODE is the major mode to support."
 
 (defun semanticdb-enable-gnu-global-in-buffer (&optional dont-err-if-not-available)
   "Enable a GNU Global database in the current buffer.
-Argument DONT-ERR-IF-NOT-AVAILABLE will throw an error if GNU Global
-is not available for this directory."
+When GNU Global is not available for this directory, display a message
+if optional DONT-ERR-IF-NOT-AVAILABLE is non-nil; else throw an error."
   (interactive "P")
   (if (cedet-gnu-global-root)
       (setq
@@ -93,7 +92,7 @@ is not available for this directory."
               '(omniscience))
        )
     (if dont-err-if-not-available
-       (message "No Global support in %s" default-directory)
+       nil; (message "No Global support in %s" default-directory)
       (error "No Global support in %s" default-directory))
     ))
 
@@ -168,7 +167,7 @@ Return a list of tags."
 
 (defmethod semanticdb-find-tags-for-completion-method
   ((table semanticdb-table-global) prefix &optional tags)
-  "In TABLE, find all occurances of tags matching PREFIX.
+  "In TABLE, find all occurrences of tags matching PREFIX.
 Optional argument TAGS is a list of tags to search.
 Returns a table of all matching tags."
   (if tags (call-next-method)
@@ -195,7 +194,7 @@ Returns a table of all matching tags."
 (defmethod semanticdb-deep-find-tags-by-name-method
   ((table semanticdb-table-global) name &optional tags)
   "Find all tags name NAME in TABLE.
-Optional argument TAGS is a list of tags t
+Optional argument TAGS is a list of tags to search.
 Like `semanticdb-find-tags-by-name-method' for global."
   (semanticdb-find-tags-by-name-method table name tags))
 
@@ -208,7 +207,7 @@ Like `semanticdb-find-tags-by-name-method' for global."
 
 (defmethod semanticdb-deep-find-tags-for-completion-method
   ((table semanticdb-table-global) prefix &optional tags)
-  "In TABLE, find all occurances of tags matching PREFIX.
+  "In TABLE, find all occurrences of tags matching PREFIX.
 Optional argument TAGS is a list of tags to search.
 Like `semanticdb-find-tags-for-completion-method' for global."
   (semanticdb-find-tags-for-completion-method table prefix tags))
@@ -220,5 +219,4 @@ Like `semanticdb-find-tags-for-completion-method' for global."
 ;; generated-autoload-load-name: "semantic/db-global"
 ;; End:
 
-;; arch-tag: ec0edab2-26c2-438f-a3d2-0d953364f8cc
 ;;; semantic/db-global.el ends here