Fix problems caused by new implementation of sub-word mode

[gnu-emacs] / lisp / cedet / semantic / texi.el

diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 9380940282f9b32d9d3b3ffdc540863437430a51..cbb7705f9d1d88761471c367fd4b8ee12c566f7d 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-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2005, 2007-2016 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
@@ -26,19 +26,13 @@
 ;; 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 ispell-lookup-words "ispell")
 (declare-function ede-current-project "ede")
 
 (defvar semantic-texi-super-regex
@@ -264,7 +258,7 @@ can handle the @menu environment.")
        (when (not parenthetical)
          ;; We are in parentheses.  Are they the types of parens
          ;; belonging to a texinfo construct?
-         (forward-word -1)
+         (forward-word-strictly -1)
          (when (looking-at "@\\w+{")
            (setq done (point))))))
     ;; If we are not in a parenthetical node, then find a block instead.
@@ -293,7 +287,7 @@ can handle the @menu environment.")
       ;; If we can't go up, we can't do this either.
       t
     ;; We moved, so now we need to skip into whatever this thing is.
-    (forward-word 1) ;; skip the command
+    (forward-word-strictly 1) ;; skip the command
     (if (looking-at "\\s-*{")
        ;; In a short command.  Go in.
        (down-list 1)
@@ -437,7 +431,7 @@ that start with that symbol."
          ((member 'word (oref context :prefixclass))
           ;; Do completion for words via ispell.
           (require 'ispell)
-          (let ((word-list (lookup-words prefix)))
+          (let ((word-list (ispell-lookup-words prefix)))
             (mapcar (lambda (f) (semantic-tag f 'word)) word-list))
           )
          (t nil))