Rename lookup-words to ispell-lookup-words

(ispell-complete-word, ispell-command-loop): All uses changed.

* cedet/semantic/texi.el (semantic-analyze-possible-completions): Use
ispell-lookup-words instead.

Fixes: debbugs:15460

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa7c08fcc39174683a6ea2e3503bd7ae12800952..39d284dac1c103efe3923191d227f55890a48039 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-09-28  Leo Liu  <sdl.web@gmail.com>
+
+       * textmodes/ispell.el (ispell-lookup-words): Rename from
+       lookup-words.  (Bug#15460)
+       (lookup-words): Obsolete.
+       (ispell-complete-word, ispell-command-loop): All uses changed.
+
 2013-09-28  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
        * lisp/progmodes/octave.el (octave-mode-map): Bind octave-send-buffer.

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index ed3301510f0f92544a8ab7edbc6b41ecadaf86e6..4a017644c84c09d9bcb950f6ef0af90f7d5f1bf8 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-28  Leo Liu  <sdl.web@gmail.com>
+
+       * semantic/texi.el (semantic-analyze-possible-completions): Use
+       ispell-lookup-words instead.  (Bug#15460)
+
 2013-09-20  Glenn Morris  <rgm@gnu.org>
 
        * semantic.el (semantic-new-buffer-fcn-was-run, semantic-active-p):

diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 34a85b8b79b9d9d7da79073f8ddf135b1f727e03..5110507718843f86e875b6d765dba230feff3b24 100644 (file)
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -32,7 +32,7 @@
 (require 'texinfo)
 
 (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
@@ -431,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))

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 3998fafa5cc4370bc867f6990f8c29b887eaff0c..a361bdae64bde37e5e767d8d40a325d58f2f8385 100644 (file)
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2407,7 +2407,7 @@ Global `ispell-quit' set to start location to continue spell session."
                                            "  --  word-list: "
                                            (or ispell-complete-word-dict
                                                ispell-alternate-dictionary))
-                                   miss (lookup-words new-word)
+                                   miss (ispell-lookup-words new-word)
                                    choices miss
                                    line ispell-choices-win-default-height)
                              (while (and choices ; adjust choices window.
@@ -2613,8 +2613,9 @@ SPC:   Accept word this time.
                (sit-for 5))
            (erase-buffer)))))))
 
+(define-obsolete-function-alias 'lookup-words 'ispell-lookup-words "24.4")
 
-(defun lookup-words (word &optional lookup-dict)
+(defun ispell-lookup-words (word &optional lookup-dict)
   "Look up WORD in optional word-list dictionary LOOKUP-DICT.
 A `*' serves as a wild card.  If no wild cards, `look' is used if it exists.
 Otherwise the variable `ispell-grep-command' contains the command used to
@@ -3766,7 +3767,7 @@ Use APPEND to append the info to previous buffer if exists."
 
 ;;;###autoload
 (defun ispell-complete-word (&optional interior-frag)
-  "Try to complete the word before or under point (see `lookup-words').
+  "Try to complete the word before or under point.
 If optional INTERIOR-FRAG is non-nil then the word may be a character
 sequence inside of a word.
 
@@ -3782,11 +3783,12 @@ Standard ispell choices are then available."
          word (car word)
          possibilities
          (or (string= word "")         ; Will give you every word
-             (lookup-words (concat (and interior-frag "*") word
-                                   (if (or interior-frag (null ispell-look-p))
-                                       "*"))
-                           (or ispell-complete-word-dict
-                               ispell-alternate-dictionary))))
+             (ispell-lookup-words
+              (concat (and interior-frag "*") word
+                      (if (or interior-frag (null ispell-look-p))
+                          "*"))
+              (or ispell-complete-word-dict
+                  ispell-alternate-dictionary))))
     (cond ((eq possibilities t)
           (message "No word to complete"))
          ((null possibilities)