Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / lisp / cedet / semantic / texi.el

diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 66327cb..34a85b8 100644 (file)
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -1,6 +1,6 @@
 ;;; semantic/texi.el --- Semantic details for Texinfo files
 
-;; Copyright (C) 2001-2005, 2007-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2005, 2007-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
@@ -26,17 +26,11 @@
 ;; parser plug-in is the function `semantic-texi-parse-region' that
 ;; overrides `semantic-parse-region'.
 
-(require 'semantic)
+(require 'semantic/db-find)
 (require 'semantic/format)
+(require 'semantic/ctxt)
 (require 'texinfo)
 
-(eval-when-compile
-  (require 'semantic/db)
-  (require 'semantic/db-find)
-  (require 'semantic/ctxt)
-  (require 'semantic/find)
-  (require 'semantic/doc))
-
 (defvar ede-minor-mode)
 (declare-function lookup-words "ispell")
 (declare-function ede-current-project "ede")
@@ -262,7 +256,7 @@ can handle the @menu environment.")
       (let ((parenthetical (semantic-up-context-default))
            )
        (when (not parenthetical)
-         ;; We are in parenthises.  Are they the types of parens
+         ;; We are in parentheses.  Are they the types of parens
          ;; belonging to a texinfo construct?
          (forward-word -1)
          (when (looking-at "@\\w+{")
@@ -421,7 +415,7 @@ Optional argument POINT is where to look for the environment."
   texinfo-mode (context)
   "List smart completions at point.
 Since texinfo is not a programming language the default version is not
-useful.  Insted, look at the current symbol.  If it is a command
+useful.  Instead, look at the current symbol.  If it is a command
 do primitive texinfo built ins.  If not, use ispell to lookup words
 that start with that symbol."
   (let ((prefix (car (oref context :prefix)))
@@ -446,11 +440,12 @@ that start with that symbol."
 \f
 ;;; Parser Setup
 ;;
-;; In semantic-imenu.el, not part of Emacs.
+;; In semantic/imenu.el, not part of Emacs.
 (defvar semantic-imenu-expandable-tag-classes)
 (defvar semantic-imenu-bucketize-file)
 (defvar semantic-imenu-bucketize-type-members)
 
+;;;###autoload
 (defun semantic-default-texi-setup ()
   "Set up a buffer for parsing of Texinfo files."
   ;; This will use our parser.
@@ -483,7 +478,7 @@ that start with that symbol."
 ;; This section provides specialized access into texinfo files.
 ;; Because texinfo files often directly refer to functions and programs
 ;; it is useful to access the texinfo file from the C code for document
-;; maintainance.
+;; maintenance.
 (defun semantic-texi-associated-files (&optional buffer)
   "Find texinfo files associated with BUFFER."
   (save-excursion
@@ -579,7 +574,7 @@ Note: TYPE not yet implemented."
 ;;         (setq doctag (if docstring sourcetag nil))))
 ;;       (setq tags (cdr tags)))))
 ;;     ;; If we found a prototype of the function that has some doc, but not the
-;;     ;; actual function, lets make due with that.
+;;     ;; actual function, let's make due with that.
 ;;     (if (not docstring)
 ;;     (cond ((stringp docstringvar)
 ;;            (setq docstring docstringvar
@@ -592,12 +587,12 @@ Note: TYPE not yet implemented."
 ;;       (error "Could not find documentation for %s" (semantic-tag-name tag)))
 ;;
 ;;     (require 'srecode)
-;;     (require 'srecode-texi)
+;;     (require 'srecode/texi)
 ;;
 ;;     ;; If we have a string, do the replacement.
 ;;     (delete-region (semantic-tag-start tag)
 ;;                (semantic-tag-end tag))
-;;     ;; Use useful functions from the docaument library.
+;;     ;; Use useful functions from the document library.
 ;;    (srecode-texi-insert-tag-as-doc doctag)
 ;;    ;(semantic-insert-foreign-tag doctag)
 ;;     ))
@@ -687,4 +682,9 @@ If TAG is nil, it is derived from the deffn under POINT."
 
 (provide 'semantic/texi)
 
+;; Local variables:
+;; generated-autoload-file: "loaddefs.el"
+;; generated-autoload-load-name: "semantic/texi"
+;; End:
+
 ;;; semantic/texi.el ends here