[Emacs-diffs] trunk r114470: Rename lookup-words to ispell-lookup-words

[Leo Liu]

------------------------------------------------------------
revno: 114470
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15460
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Sat 2013-09-28 10:54:27 +0800
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/cedet/ChangeLog           changelog-20100919015713-3rbr456yray5m84f-1
  lisp/cedet/semantic/texi.el    texi.el-20091113204419-o5vbwnq5f7feedwu-11306
  lisp/textmodes/ispell.el       ispell.el-20091113204419-o5vbwnq5f7feedwu-694

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-28 02:41:48 +0000
+++ b/lisp/ChangeLog    2013-09-28 02:54:27 +0000
@@ -1,3 +1,10 @@
+2013-09-28  Leo Liu  <address@hidden>
+
+       * 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  <address@hidden>
 
        * lisp/progmodes/octave.el (octave-mode-map): Bind octave-send-buffer.

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2013-09-20 17:21:28 +0000
+++ b/lisp/cedet/ChangeLog      2013-09-28 02:54:27 +0000
@@ -1,3 +1,8 @@
+2013-09-28  Leo Liu  <address@hidden>
+
+       * semantic/texi.el (semantic-analyze-possible-completions): Use
+       ispell-lookup-words instead.  (Bug#15460)
+
 2013-09-20  Glenn Morris  <address@hidden>
 
        * semantic.el (semantic-new-buffer-fcn-was-run, semantic-active-p):

=== modified file 'lisp/cedet/semantic/texi.el'
--- a/lisp/cedet/semantic/texi.el       2013-01-01 09:11:05 +0000
+++ b/lisp/cedet/semantic/texi.el       2013-09-28 02:54:27 +0000
@@ -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 @@
          ((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))

=== modified file 'lisp/textmodes/ispell.el'
--- a/lisp/textmodes/ispell.el  2013-08-05 14:26:57 +0000
+++ b/lisp/textmodes/ispell.el  2013-09-28 02:54:27 +0000
@@ -2407,7 +2407,7 @@
                                            "  --  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 @@
                (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 @@
 
 ;;;###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 @@
          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)