Subject: 24.3; [PATCH] rename lookup-words to ispell-lookup-words
From: Leo Liu <[email-masked]>
To: [email-masked]
Date: Wed, 25 Sep 2013 13:13:28 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Any objection to renaming lookup-words?

=== modified file 'lisp/cedet/semantic/texi.el'
--- lisp/cedet/semantic/texi.el	2013-01-01 09:11:05 +0000
+++ lisp/cedet/semantic/texi.el	2013-09-25 05:09:43 +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'
--- lisp/textmodes/ispell.el	2013-08-05 14:26:57 +0000
+++ lisp/textmodes/ispell.el	2013-09-25 05:11:28 +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.
@@ -2614,7 +2614,7 @@
 	    (erase-buffer)))))))

-(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 +3766,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 +3782,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)