mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

Rename lookup-words to ispell-lookup-words

Browse source 
(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
This commit is contained in:
Leo Liu 2013-09-28 10:54:27 +08:00
parent 7e138a6216
commit e090f499ee
4 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -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.

5
lisp/cedet/ChangeLog
View file

@ -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):

4
lisp/cedet/semantic/texi.el
View file

@ -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))

18
lisp/textmodes/ispell.el
View file

@ -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)