diff options
| author | Leo Liu | 2013-09-28 10:54:27 +0800 |
|---|---|---|
| committer | Leo Liu | 2013-09-28 10:54:27 +0800 |
| commit | e090f499ee3103d5d1677c654d3d09020d7959cd (patch) | |
| tree | 47756d1cd72e53502f521fd485f7a08e9bd99c0b /lisp/textmodes | |
| parent | 7e138a62168e5a027c8818b344f73ae227cca547 (diff) | |
| download | emacs-e090f499ee3103d5d1677c654d3d09020d7959cd.tar.gz emacs-e090f499ee3103d5d1677c654d3d09020d7959cd.zip | |
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
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/ispell.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 3998fafa5cc..a361bdae64b 100644 --- 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." | |||
| 2407 | " -- word-list: " | 2407 | " -- word-list: " |
| 2408 | (or ispell-complete-word-dict | 2408 | (or ispell-complete-word-dict |
| 2409 | ispell-alternate-dictionary)) | 2409 | ispell-alternate-dictionary)) |
| 2410 | miss (lookup-words new-word) | 2410 | miss (ispell-lookup-words new-word) |
| 2411 | choices miss | 2411 | choices miss |
| 2412 | line ispell-choices-win-default-height) | 2412 | line ispell-choices-win-default-height) |
| 2413 | (while (and choices ; adjust choices window. | 2413 | (while (and choices ; adjust choices window. |
| @@ -2613,8 +2613,9 @@ SPC: Accept word this time. | |||
| 2613 | (sit-for 5)) | 2613 | (sit-for 5)) |
| 2614 | (erase-buffer))))))) | 2614 | (erase-buffer))))))) |
| 2615 | 2615 | ||
| 2616 | (define-obsolete-function-alias 'lookup-words 'ispell-lookup-words "24.4") | ||
| 2616 | 2617 | ||
| 2617 | (defun lookup-words (word &optional lookup-dict) | 2618 | (defun ispell-lookup-words (word &optional lookup-dict) |
| 2618 | "Look up WORD in optional word-list dictionary LOOKUP-DICT. | 2619 | "Look up WORD in optional word-list dictionary LOOKUP-DICT. |
| 2619 | A `*' serves as a wild card. If no wild cards, `look' is used if it exists. | 2620 | A `*' serves as a wild card. If no wild cards, `look' is used if it exists. |
| 2620 | Otherwise the variable `ispell-grep-command' contains the command used to | 2621 | 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." | |||
| 3766 | 3767 | ||
| 3767 | ;;;###autoload | 3768 | ;;;###autoload |
| 3768 | (defun ispell-complete-word (&optional interior-frag) | 3769 | (defun ispell-complete-word (&optional interior-frag) |
| 3769 | "Try to complete the word before or under point (see `lookup-words'). | 3770 | "Try to complete the word before or under point. |
| 3770 | If optional INTERIOR-FRAG is non-nil then the word may be a character | 3771 | If optional INTERIOR-FRAG is non-nil then the word may be a character |
| 3771 | sequence inside of a word. | 3772 | sequence inside of a word. |
| 3772 | 3773 | ||
| @@ -3782,11 +3783,12 @@ Standard ispell choices are then available." | |||
| 3782 | word (car word) | 3783 | word (car word) |
| 3783 | possibilities | 3784 | possibilities |
| 3784 | (or (string= word "") ; Will give you every word | 3785 | (or (string= word "") ; Will give you every word |
| 3785 | (lookup-words (concat (and interior-frag "*") word | 3786 | (ispell-lookup-words |
| 3786 | (if (or interior-frag (null ispell-look-p)) | 3787 | (concat (and interior-frag "*") word |
| 3787 | "*")) | 3788 | (if (or interior-frag (null ispell-look-p)) |
| 3788 | (or ispell-complete-word-dict | 3789 | "*")) |
| 3789 | ispell-alternate-dictionary)))) | 3790 | (or ispell-complete-word-dict |
| 3791 | ispell-alternate-dictionary)))) | ||
| 3790 | (cond ((eq possibilities t) | 3792 | (cond ((eq possibilities t) |
| 3791 | (message "No word to complete")) | 3793 | (message "No word to complete")) |
| 3792 | ((null possibilities) | 3794 | ((null possibilities) |