Mercurial > emacs
annotate lisp/textmodes/ispell.el @ 20483:141c2d41d39c
(toggle-enable-multibyte-characters): Doc fix.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 21 Dec 1997 01:49:03 +0000 |
parents | e15a9b5e0a70 |
children | 231db957ece0 |
rev | line source |
---|---|
13337 | 1 ;;; ispell.el --- spell checking using Ispell |
2 | |
19668 | 3 ;; Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc. |
13337 | 4 |
14169 | 5 ;; Authors : Ken Stevens <k.stevens@ieee.org> |
6 ;; Last Modified On: Tue Jun 13 12:05:28 EDT 1995 | |
7 ;; Update Revision : 2.37 | |
8 ;; Syntax : emacs-lisp | |
9 ;; Status : Release with 3.1.12+ ispell. | |
10 ;; Version : International Ispell Version 3.1 by Geoff Kuenning. | |
11 ;; Bug Reports : ispell-el-bugs@itcorp.com | |
13337 | 12 |
14169 | 13 ;; This file is part of GNU Emacs. |
13337 | 14 |
14169 | 15 ;; GNU Emacs is free software; you can redistribute it and/or modify |
16 ;; it under the terms of the GNU General Public License as published by | |
17 ;; the Free Software Foundation; either version 2, or (at your option) | |
18 ;; any later version. | |
19 | |
20 ;; GNU Emacs is distributed in the hope that it will be useful, | |
21 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
23 ;; GNU General Public License for more details. | |
24 | |
25 ;; You should have received a copy of the GNU General Public License | |
26 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
27 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
28 ;; Boston, MA 02111-1307, USA. | |
29 | |
30 ;; Note: version numbers and time stamp are not updated | |
31 ;; when this file is edited for release with GNU Emacs. | |
32 | |
6138 | 33 ;;; Commentary: |
14169 | 34 |
35 ;; INSTRUCTIONS | |
36 ;; | |
37 ;; This code contains a section of user-settable variables that you should | |
38 ;; inspect prior to installation. Look past the end of the history list. | |
39 ;; Set them up for your locale and the preferences of the majority of the | |
40 ;; users. Otherwise the users may need to set a number of variables | |
41 ;; themselves. | |
42 ;; You particularly may want to change the default dictionary for your | |
43 ;; country and language. | |
44 ;; | |
45 ;; | |
46 ;; To fully install this, add this file to your Emacs Lisp directory and | |
47 ;; compile it with M-X byte-compile-file. Then add the following to the | |
48 ;; appropriate init file: | |
49 ;; | |
50 ;; (autoload 'ispell-word "ispell" | |
51 ;; "Check the spelling of word in buffer." t) | |
52 ;; (global-set-key "\e$" 'ispell-word) | |
53 ;; (autoload 'ispell-region "ispell" | |
54 ;; "Check the spelling of region." t) | |
55 ;; (autoload 'ispell-buffer "ispell" | |
56 ;; "Check the spelling of buffer." t) | |
57 ;; (autoload 'ispell-complete-word "ispell" | |
58 ;; "Look up current word in dictionary and try to complete it." t) | |
59 ;; (autoload 'ispell-change-dictionary "ispell" | |
60 ;; "Change ispell dictionary." t) | |
61 ;; (autoload 'ispell-message "ispell" | |
62 ;; "Check spelling of mail message or news post.") | |
63 ;; | |
64 ;; Depending on the mail system you use, you may want to include these: | |
65 ;; | |
66 ;; (add-hook 'news-inews-hook 'ispell-message) | |
67 ;; (add-hook 'mail-send-hook 'ispell-message) | |
68 ;; (add-hook 'mh-before-send-letter-hook 'ispell-message) | |
69 ;; | |
70 ;; | |
71 ;; Ispell has a TeX parser and a nroff parser (the default). | |
72 ;; The parsing is controlled by the variable ispell-parser. Currently | |
73 ;; it is just a "toggle" between TeX and nroff, but if more parsers are | |
74 ;; added it will be updated. See the variable description for more info. | |
75 ;; | |
76 ;; | |
77 ;; TABLE OF CONTENTS | |
78 ;; | |
79 ;; ispell-word | |
80 ;; ispell-region | |
81 ;; ispell-buffer | |
82 ;; ispell-message | |
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
83 ;; ispell-comments-and-strings |
14169 | 84 ;; ispell-continue |
85 ;; ispell-complete-word | |
86 ;; ispell-complete-word-interior-frag | |
87 ;; ispell-change-dictionary | |
88 ;; ispell-kill-ispell | |
89 ;; ispell-pdict-save | |
90 ;; | |
91 ;; | |
92 ;; Commands in ispell-region: | |
93 ;; Character replacement: Replace word with choice. May query-replace. | |
94 ;; ' ': Accept word this time. | |
95 ;; 'i': Accept word and insert into private dictionary. | |
96 ;; 'a': Accept word for this session. | |
97 ;; 'A': Accept word and place in buffer-local dictionary. | |
98 ;; 'r': Replace word with typed-in value. Rechecked. | |
99 ;; 'R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. | |
100 ;; '?': Show these commands | |
101 ;; 'x': Exit spelling buffer. Move cursor to original point. | |
102 ;; 'X': Exit spelling buffer. Leave cursor at the current point. | |
103 ;; 'q': Quit spelling session (Kills ispell process). | |
104 ;; 'l': Look up typed-in replacement in alternate dictionary. Wildcards okay. | |
105 ;; 'u': Like 'i', but the word is lower-cased first. | |
106 ;; 'm': Like 'i', but allows one to include dictionary completion info. | |
107 ;; 'C-l': redraws screen | |
108 ;; 'C-r': recursive edit | |
109 ;; 'C-z': suspend emacs or iconify frame | |
110 ;; | |
111 ;; Buffer-Local features: | |
112 ;; There are a number of buffer-local features that can be used to customize | |
113 ;; ispell for the current buffer. This includes language dictionaries, | |
114 ;; personal dictionaries, parsing, and local word spellings. Each of these | |
115 ;; local customizations are done either through local variables, or by | |
116 ;; including the keyword and argument(s) at the end of the buffer (usually | |
117 ;; prefixed by the comment characters). See the end of this file for | |
118 ;; examples. The local keywords and variables are: | |
119 ;; | |
120 ;; ispell-dictionary-keyword language-dictionary | |
121 ;; uses local variable ispell-local-dictionary | |
122 ;; ispell-pdict-keyword personal-dictionary | |
123 ;; uses local variable ispell-local-pdict | |
124 ;; ispell-parsing-keyword mode-arg extended-char-arg | |
125 ;; ispell-words-keyword any number of local word spellings | |
126 ;; | |
127 ;; | |
128 ;; BUGS: | |
129 ;; Highlighting in version 19 still doesn't work on tty's. | |
130 ;; On some versions of emacs, growing the minibuffer fails. | |
131 ;; | |
132 ;; HISTORY | |
133 ;; | |
15551
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
134 ;; Revision 2.38 1996/5/30 ethanb@phys.washington.edu |
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
135 ;; Update ispell-message for gnus 5 (news-inews-hook => message-send-hook; |
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
136 ;; different header for quoted message). |
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
137 ;; |
14169 | 138 ;; Revision 2.37 1995/6/13 12:05:28 stevens |
139 ;; Removed autoload from ispell-dictionary-alist. *choices* mode-line shows | |
140 ;; misspelled word. Block skip for pgp & forwarded messages added. | |
141 ;; RMS: the autoload changes had problems and I removed them. | |
142 ;; | |
143 ;; Revision 2.36 1995/2/6 17:39:38 stevens | |
144 ;; Properly adjust screen with different ispell-choices-win-default-height | |
145 ;; settings. Skips SGML entity references. | |
146 ;; | |
147 ;; Revision 2.35 1995/1/13 14:16:46 stevens | |
148 ;; Skips SGML tags, ispell-change-dictionary fix for add-hook, assure personal | |
149 ;; dictionary is saved when called from the menu | |
150 ;; | |
151 ;; Revision 2.34 1994/12/08 13:17:41 stevens | |
152 ;; Interaction corrected to function with all 3.1 ispell versions. | |
153 ;; | |
154 ;; Revision 2.33 1994/11/24 02:31:20 stevens | |
155 ;; Repaired bug introduced in 2.32 that corrupts buffers when correcting. | |
156 ;; Improved buffer scrolling. Nondestructive buffer selections allowed. | |
157 ;; | |
158 ;; Revision 2.32 1994/10/31 21:10:08 geoff | |
159 ;; Many revisions accepted from RMS/FSF. I think (though I don't know) that | |
160 ;; this represents an 'official' version. | |
161 ;; | |
162 ;; Revision 2.31 1994/5/31 10:18:17 stevens | |
163 ;; Repaired comments. buffer-local commands executed in `ispell-word' now. | |
164 ;; German dictionary described for extended character mode. Dict messages. | |
165 ;; | |
166 ;; Revision 2.30 1994/5/20 22:18:36 stevens | |
167 ;; Continue ispell from ispell-word, C-z functionality fixed. | |
168 ;; | |
169 ;; Revision 2.29 1994/5/12 09:44:33 stevens | |
170 ;; Restored ispell-use-ptys-p, ispell-message aborts sends with interrupt. | |
171 ;; defined fn ispell | |
172 ;; | |
173 ;; Revision 2.28 1994/4/28 16:24:40 stevens | |
174 ;; Window checking when ispell-message put on gnus-inews-article-hook jwz. | |
175 ;; prefixed ispell- to highlight functions and horiz-scroll fn. | |
176 ;; Try and respect case of word in ispell-complete-word. | |
177 ;; Ignore non-char events. Ispell-use-ptys-p commented out. Lucid menu. | |
178 ;; Better interrupt handling. ispell-message improvements from Ethan. | |
179 ;; | |
180 ;; Revision 2.27 | |
181 ;; version 18 explicit C-g handling disabled as it didn't work. Added | |
182 ;; ispell-extra-args for ispell customization (jwz) | |
183 ;; | |
184 ;; Revision 2.26 1994/2/15 16:11:14 stevens | |
185 ;; name changes for copyright assignment. Added word-frags in complete-word. | |
186 ;; Horizontal scroll (John Conover). Query-replace matches words now. bugs. | |
187 ;; | |
188 ;; Revision 2.25 | |
189 ;; minor mods, upgraded ispell-message | |
190 ;; | |
191 ;; Revision 2.24 | |
192 ;; query-replace more robust, messages, defaults, ispell-change-dict. | |
193 ;; | |
194 ;; Revision 2.23 1993/11/22 23:47:03 stevens | |
195 ;; ispell-message, Fixed highlighting, added menu-bar, fixed ispell-help, ... | |
196 ;; | |
197 ;; Revision 2.22 | |
198 ;; Added 'u' command. Fixed default in ispell-local-dictionary. | |
199 ;; fixed affix rules display. Tib skipping more robust. Contributions by | |
200 ;; Per Abraham (parser selection), Denis Howe, and Eberhard Mattes. | |
201 ;; | |
202 ;; Revision 2.21 1993/06/30 14:09:04 stevens | |
203 ;; minor bugs. (nroff word skipping fixed) | |
204 ;; | |
205 ;; Revision 2.20 1993/06/30 14:09:04 stevens | |
206 ;; | |
207 ;; Debugging and contributions by: Boris Aronov, Rik Faith, Chris Moore, | |
208 ;; Kevin Rodgers, Malcolm Davis. | |
209 ;; Particular thanks to Michael Lipp, Jamie Zawinski, Phil Queinnec | |
210 ;; and John Heidemann for suggestions and code. | |
211 ;; Major update including many tweaks. | |
212 ;; Many changes were integrations of suggestions. | |
213 ;; lookup-words rehacked to use call-process (Jamie). | |
214 ;; ispell-complete-word rehacked to be compatible with the rest of the | |
215 ;; system for word searching and to include multiple wildcards, | |
16427 | 216 ;; and its own dictionary. |
14169 | 217 ;; query-replace capability added. New options 'X', 'R', and 'A'. |
218 ;; buffer-local modes for dictionary, word-spelling, and formatter-parsing. | |
219 ;; Many random bugs, like commented comments being skipped, fix to | |
220 ;; keep-choices-win, fix for math mode, added pipe mode choice, | |
221 ;; fixed 'q' command, ispell-word checks previous word and leave cursor | |
222 ;; in same location. Fixed tib code which could drop spelling regions. | |
223 ;; Cleaned up setq calls for efficiency. Gave more context on window overlays. | |
224 ;; Assure context on ispell-command-loop. Window lossage in look cmd fixed. | |
225 ;; Due to pervasive opinion, common-lisp package syntax removed. Display | |
226 ;; problem when not highlighting. | |
227 ;; | |
228 ;; Revision 2.19 1992/01/10 10:54:08 geoff | |
229 ;; Make another attempt at fixing the "Bogus, dude" problem. This one is | |
230 ;; less elegant, but has the advantage of working. | |
231 ;; | |
232 ;; Revision 2.18 1992/01/07 10:04:52 geoff | |
233 ;; Fix the "Bogus, Dude" problem in ispell-word. | |
234 ;; | |
235 ;; Revision 2.17 1991/09/12 00:01:42 geoff | |
236 ;; Add some changes to make ispell-complete-word work better, though | |
237 ;; still not perfectly. | |
238 ;; | |
239 ;; Revision 2.16 91/09/04 18:00:52 geoff | |
240 ;; More updates from Sebastian, to make the multiple-dictionary support | |
241 ;; more flexible. | |
242 ;; | |
243 ;; Revision 2.15 91/09/04 17:30:02 geoff | |
244 ;; Sebastian Kremer's tib support | |
245 ;; | |
246 ;; Revision 2.14 91/09/04 16:19:37 geoff | |
247 ;; Don't do set-window-start if the move-to-window-line moved us | |
248 ;; downward, rather than upward. This prevents getting the buffer all | |
249 ;; confused. Also, don't use the "not-modified" function to clear the | |
250 ;; modification flag; instead use set-buffer-modified-p. This prevents | |
251 ;; extra messages from flashing. | |
252 ;; | |
253 ;; Revision 2.13 91/09/04 14:35:41 geoff | |
254 ;; Fix a spelling error in a comment. Add code to handshake with the | |
255 ;; ispell process before sending anything to it. | |
256 ;; | |
257 ;; Revision 2.12 91/09/03 20:14:21 geoff | |
258 ;; Add Sebastian Kremer's multiple-language support. | |
259 ;; | |
260 ;; | |
261 ;; Walt Buehring | |
262 ;; Texas Instruments - Computer Science Center | |
263 ;; ARPA: Buehring%TI-CSL@CSNet-Relay | |
264 ;; UUCP: {smu, texsun, im4u, rice} ! ti-csl ! buehring | |
265 ;; | |
266 ;; ispell-region and associated routines added by | |
267 ;; Perry Smith | |
268 ;; pedz@bobkat | |
269 ;; Tue Jan 13 20:18:02 CST 1987 | |
270 ;; | |
271 ;; extensively modified by Mark Davies and Andrew Vignaux | |
272 ;; {mark,andrew}@vuwcomp | |
273 ;; Sun May 10 11:45:04 NZST 1987 | |
274 ;; | |
275 ;; Ken Stevens ARPA: k.stevens@ieee.org | |
276 ;; Tue Jan 3 16:59:07 PST 1989 | |
277 ;; This file has overgone a major overhaul to be compatible with ispell | |
278 ;; version 2.1. Most of the functions have been totally rewritten, and | |
279 ;; many user-accessible variables have been added. The syntax table has | |
280 ;; been removed since it didn't work properly anyway, and a filter is | |
281 ;; used rather than a buffer. Regular expressions are used based on | |
282 ;; ispell's internal definition of characters (see ispell(4)). | |
283 ;; Some new updates: | |
284 ;; - Updated to version 3.0 to include terse processing. | |
285 ;; - Added a variable for the look command. | |
286 ;; - Fixed a bug in ispell-word when cursor is far away from the word | |
287 ;; that is to be checked. | |
288 ;; - Ispell places the incorrect word or guess in the minibuffer now. | |
289 ;; - fixed a bug with 'l' option when multiple windows are on the screen. | |
290 ;; - lookup-words just didn't work with the process filter. Fixed. | |
291 ;; - Rewrote the process filter to make it cleaner and more robust | |
292 ;; in the event of a continued line not being completed. | |
293 ;; - Made ispell-init-process more robust in handling errors. | |
294 ;; - Fixed bug in continuation location after a region has been modified by | |
295 ;; correcting a misspelling. | |
296 ;; Mon 17 Sept 1990 | |
297 ;; | |
298 ;; Sebastian Kremer <sk@thp.uni-koeln.de> | |
299 ;; Wed Aug 7 14:02:17 MET DST 1991 | |
300 ;; - Ported ispell-complete-word from Ispell 2 to Ispell 3. | |
301 ;; - Added ispell-kill-ispell command. | |
302 ;; - Added ispell-dictionary and ispell-dictionary-alist variables to | |
303 ;; support other than default language. See their docstrings and | |
304 ;; command ispell-change-dictionary. | |
305 ;; - (ispelled it :-) | |
306 ;; - Added ispell-skip-tib variable to support the tib bibliography | |
307 ;; program. | |
6138 | 308 |
309 | |
14169 | 310 ;; ********************************************************************** |
311 ;; The following variables should be set according to personal preference | |
312 ;; and location of binaries: | |
313 ;; ********************************************************************** | |
6138 | 314 |
14169 | 315 ;; ******* THIS FILE IS WRITTEN FOR ISPELL VERSION 3.1 |
6138 | 316 |
317 ;;; Code: | |
318 | |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
319 (defgroup ispell nil |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
320 "Spell checking using ispell" |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
321 :group 'processes) |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
322 |
6138 | 323 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
324 (defcustom ispell-highlight-p t |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
325 "*Highlight spelling errors when non-nil." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
326 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
327 :group 'ispell) |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
328 |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
329 (defcustom ispell-highlight-face 'highlight |
7607 | 330 "*The face used for Ispell highlighting. For Emacses with overlays. |
331 Possible values are `highlight', `modeline', `secondary-selection', | |
332 `region', and `underline'. | |
6138 | 333 This variable can be set by the user to whatever face they desire. |
334 It's most convenient if the cursor color and highlight color are | |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
335 slightly different." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
336 :type 'face |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
337 :group 'ispell) |
6138 | 338 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
339 (defcustom ispell-check-comments t |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
340 "*If nil, don't check spelling of comments." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
341 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
342 :group 'ispell) |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
343 |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
344 (defcustom ispell-query-replace-choices nil |
7606 | 345 "*Corrections made throughout region when non-nil. |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
346 Uses `query-replace' (\\[query-replace]) for corrections." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
347 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
348 :group 'ispell) |
6138 | 349 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
350 (defcustom ispell-skip-tib nil |
7607 | 351 "*Does not spell check `tib' bibliography references when non-nil. |
7606 | 352 Skips any text between strings matching regular expressions |
7607 | 353 `ispell-tib-ref-beginning' and `ispell-tib-ref-end'. |
6138 | 354 |
355 TeX users beware: Any field starting with [. will skip until a .] -- even | |
7607 | 356 your whole buffer -- unless you set `ispell-skip-tib' to nil. That includes |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
357 a [.5mm] type of number...." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
358 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
359 :group 'ispell) |
6138 | 360 |
361 (defvar ispell-tib-ref-beginning "[[<]\\." | |
362 "Regexp matching the beginning of a Tib reference.") | |
363 | |
364 (defvar ispell-tib-ref-end "\\.[]>]" | |
365 "Regexp matching the end of a Tib reference.") | |
366 | |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
367 (defcustom ispell-keep-choices-win t |
7607 | 368 "*When not nil, the `*Choices*' window remains for spelling session. |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
369 This minimizes redisplay thrashing." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
370 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
371 :group 'ispell) |
6138 | 372 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
373 (defcustom ispell-choices-win-default-height 2 |
7607 | 374 "*The default size of the `*Choices*' window, including status line. |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
375 Must be greater than 1." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
376 :type 'integer |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
377 :group 'ispell) |
6138 | 378 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
379 (defcustom ispell-program-name "ispell" |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
380 "Program invoked by \\[ispell-word] and \\[ispell-region] commands." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
381 :type 'string |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
382 :group 'ispell) |
6138 | 383 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
384 (defcustom ispell-alternate-dictionary |
6138 | 385 (cond ((file-exists-p "/usr/dict/web2") "/usr/dict/web2") |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
386 ((file-exists-p "/usr/share/dict/web2") "/usr/share/dict/web2") |
6138 | 387 ((file-exists-p "/usr/dict/words") "/usr/dict/words") |
388 ((file-exists-p "/usr/lib/dict/words") "/usr/lib/dict/words") | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
389 ((file-exists-p "/usr/share/dict/words") "/usr/share/dict/words") |
6138 | 390 ((file-exists-p "/sys/dict") "/sys/dict") |
391 (t "/usr/dict/words")) | |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
392 "*Alternate dictionary for spelling help." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
393 :type 'file |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
394 :group 'ispell) |
6138 | 395 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
396 (defcustom ispell-complete-word-dict ispell-alternate-dictionary |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
397 "*Dictionary used for word completion." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
398 :type 'file |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
399 :group 'ispell) |
6138 | 400 |
9684
c12e33cc5e0a
(ispell-grep-command, ispell-look-command): Don't specify directory.
Richard M. Stallman <rms@gnu.org>
parents:
9416
diff
changeset
|
401 (defvar ispell-grep-command "egrep" |
6138 | 402 "Name of the grep command for search processes.") |
403 | |
404 (defvar ispell-grep-options "-i" | |
7607 | 405 "String of options to use when running the program in `ispell-grep-command'. |
6138 | 406 Should probably be \"-i\" or \"-e\". |
407 Some machines (like the NeXT) don't support \"-i\"") | |
408 | |
9684
c12e33cc5e0a
(ispell-grep-command, ispell-look-command): Don't specify directory.
Richard M. Stallman <rms@gnu.org>
parents:
9416
diff
changeset
|
409 (defvar ispell-look-command "look" |
6138 | 410 "Name of the look command for search processes. |
7607 | 411 This must be an absolute file name.") |
6138 | 412 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
413 (defcustom ispell-look-p (file-exists-p ispell-look-command) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
414 "*Non-nil means use `look' rather than `grep'. |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
415 Default is based on whether `look' seems to be available." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
416 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
417 :group 'ispell) |
6138 | 418 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
419 (defcustom ispell-have-new-look nil |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
420 "*Non-nil means use the `-r' option (regexp) when running `look'." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
421 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
422 :group 'ispell) |
6138 | 423 |
424 (defvar ispell-look-options (if ispell-have-new-look "-dfr" "-df") | |
7607 | 425 "String of command options for `ispell-look-command'.") |
6138 | 426 |
427 (defvar ispell-use-ptys-p nil | |
7607 | 428 "When non-nil, Emacs uses ptys to communicate with Ispell. |
429 When nil, Emacs uses pipes.") | |
6138 | 430 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
431 (defcustom ispell-following-word nil |
7607 | 432 "*Non-nil means `ispell-word' checks the word around or after point. |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
433 Otherwise `ispell-word' checks the preceding word." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
434 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
435 :group 'ispell) |
6138 | 436 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
437 (defcustom ispell-help-in-bufferp nil |
7607 | 438 "*Non-nil means display interactive keymap help in a buffer. |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
439 Otherwise use the minibuffer." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
440 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
441 :group 'ispell) |
6138 | 442 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
443 (defcustom ispell-quietly nil |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
444 "*Non-nil means suppress messages in `ispell-word'." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
445 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
446 :group 'ispell) |
6138 | 447 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
448 (defcustom ispell-format-word (function upcase) |
7606 | 449 "*Formatting function for displaying word being spell checked. |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
450 The function must take one string argument and return a string." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
451 :type 'function |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
452 :group 'ispell) |
6138 | 453 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
454 ;;;###autoload |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
455 (defcustom ispell-personal-dictionary nil |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
456 "*File name of your personal spelling dictionary, or nil. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
457 If nil, the default personal dictionary, \"~/.ispell_DICTNAME\" is used, |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
458 where DICTNAME is the name of your default dictionary." |
19828
fa6f38bb8ac1
(ispell-personal-dictionary): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19785
diff
changeset
|
459 :type '(choice file |
fa6f38bb8ac1
(ispell-personal-dictionary): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19785
diff
changeset
|
460 (const :tag "default" nil)) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
461 :group 'ispell) |
6138 | 462 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
463 (defcustom ispell-silently-savep nil |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
464 "*When non-nil, save the personal dictionary without confirmation." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
465 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
466 :group 'ispell) |
6138 | 467 |
468 ;;; This variable contains the current dictionary being used if the ispell | |
469 ;;; process is running. Otherwise it contains the global default. | |
470 (defvar ispell-dictionary nil | |
471 "If non-nil, a dictionary to use instead of the default one. | |
7607 | 472 This is passed to the ispell process using the `-d' switch and is |
473 used as key in `ispell-dictionary-alist' (which see). | |
6138 | 474 |
7607 | 475 You should set this variable before your first use of Emacs spell-checking |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
476 commands in the Emacs session, or else use the \\[ispell-change-dictionary] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
477 command to change it. Otherwise, this variable only takes effect in a newly |
7607 | 478 started Ispell process.") |
6138 | 479 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
480 (defcustom ispell-extra-args nil |
7607 | 481 "*If non-nil, a list of extra switches to pass to the Ispell program. |
7606 | 482 For example, '(\"-W\" \"3\") to cause it to accept all 1-3 character |
483 words as correct. See also `ispell-dictionary-alist', which may be used | |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
484 for language-specific arguments." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
485 :type '(repeat string) |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
486 :group 'ispell) |
7606 | 487 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
488 ;;; The preparation of the menu bar menu must be autoloaded |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
489 ;;; because otherwise this file gets autoloaded every time Emacs starts |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
490 ;;; so that it can set up the menus and determine keyboard equivalents. |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
491 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
492 ;;;###autoload |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
493 (defvar ispell-dictionary-alist-1 ; sk 9-Aug-1991 18:28 |
6138 | 494 '((nil ; default (english.aff) |
8676
ddbf6eaedf22
(ispell-dictionary-alist-1): For English, remove hyphen from the OTHERCHARS.
Richard M. Stallman <rms@gnu.org>
parents:
8613
diff
changeset
|
495 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil) |
16217
bf9ff58e9518
(ispell-dictionary-alist-1): Add `american' to list.
Richard M. Stallman <rms@gnu.org>
parents:
15551
diff
changeset
|
496 ("english" ; make English explicitly selectable |
8676
ddbf6eaedf22
(ispell-dictionary-alist-1): For English, remove hyphen from the OTHERCHARS.
Richard M. Stallman <rms@gnu.org>
parents:
8613
diff
changeset
|
497 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil) |
16217
bf9ff58e9518
(ispell-dictionary-alist-1): Add `american' to list.
Richard M. Stallman <rms@gnu.org>
parents:
15551
diff
changeset
|
498 ("british" ; British version |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
499 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B" "-d" "british") nil) |
16217
bf9ff58e9518
(ispell-dictionary-alist-1): Add `american' to list.
Richard M. Stallman <rms@gnu.org>
parents:
15551
diff
changeset
|
500 ("american" ; American version |
bf9ff58e9518
(ispell-dictionary-alist-1): Add `american' to list.
Richard M. Stallman <rms@gnu.org>
parents:
15551
diff
changeset
|
501 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B" "-d" "american") nil) |
6138 | 502 ("deutsch" ; deutsch.aff |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
503 "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex") |
6138 | 504 ("deutsch8" |
505 "[a-zA-Z\304\326\334\344\366\337\374]" | |
506 "[^a-zA-Z\304\326\334\344\366\337\374]" | |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
507 "[']" t ("-C" "-d" "deutsch") "~latin1" iso-latin-1) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
508 ("nederlands" ; nederlands.aff |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
509 "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
510 "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
511 "[']" t ("-C") nil iso-latin-1) |
6138 | 512 ("nederlands8" ; dutch8.aff |
513 "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" | |
514 "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" | |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
515 "[']" t ("-C") nil iso-latin-1))) |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
516 |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
517 ;;;###autoload |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
518 (defvar ispell-dictionary-alist-2 |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
519 '(("svenska" ;7 bit swedish mode |
6138 | 520 "[A-Za-z}{|\\133\\135\\\\]" "[^A-Za-z}{|\\133\\135\\\\]" |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
521 "[']" nil ("-C") nil) |
6138 | 522 ("svenska8" ;8 bit swedish mode |
523 "[A-Za-z\345\344\366\305\304\366]" "[^A-Za-z\345\344\366\305\304\366]" | |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
524 "[']" nil ("-C" "-d" "svenska") "~list" ; Add `"-T" "list"' instead? |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
525 iso-latin-1) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
526 ("francais7" |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
527 "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
528 ("francais" ; francais.aff |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
529 "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
530 "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
531 "[---']" t nil "~list" iso-latin-1) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
532 ("francais-tex" ; francais.aff |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
533 "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
534 "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
535 "[---'^`\"]" t nil "~tex" iso-latin-1) |
7606 | 536 ("dansk" ; dansk.aff |
6138 | 537 "[A-Z\306\330\305a-z\346\370\345]" "[^A-Z\306\330\305a-z\346\370\345]" |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
538 "[']" nil ("-C") nil iso-latin-1) |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
539 )) |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
540 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
541 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
542 ;;; ispell-dictionary-alist is set up from two subvariables above |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
543 ;;; to avoid having very long lines in loaddefs.el. |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
544 ;;;###autoload |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
545 (defvar ispell-dictionary-alist |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
546 (append ispell-dictionary-alist-1 ispell-dictionary-alist-2) |
6138 | 547 "An alist of dictionaries and their associated parameters. |
548 | |
549 Each element of this list is also a list: | |
550 | |
7606 | 551 \(DICTIONARY-NAME CASECHARS NOT-CASECHARS OTHERCHARS MANY-OTHERCHARS-P |
6138 | 552 ISPELL-ARGS EXTENDED-CHARACTER-MODE\) |
553 | |
7607 | 554 DICTIONARY-NAME is a possible value of variable `ispell-dictionary', nil |
6138 | 555 means the default dictionary. |
556 | |
557 CASECHARS is a regular expression of valid characters that comprise a | |
558 word. | |
559 | |
560 NOT-CASECHARS is the opposite regexp of CASECHARS. | |
561 | |
19183
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
562 OTHERCHARS are characters in the NOT-CASECHARS set but which can be used to |
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
563 construct words in some special way. If OTHERCHARS characters follow and |
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
564 precede characters from CASECHARS, they are parsed as part of a word, |
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
565 otherwise they become word-breaks. As an example in English, assume the |
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
566 set ['] (as a regular expression) for OTHERCHARS. Then \"they're\" and |
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
567 \"Steven's\" are parsed as single words including the \"'\" character, but |
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
568 \"Stevens'\" does not include the quote character as part of the word. |
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
569 If you want OTHERCHARS to be empty, use nil. |
6138 | 570 Hint: regexp syntax requires the hyphen to be declared first here. |
571 | |
19183
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
572 MANY-OTHERCHARS-P is non-nil when multiple OTHERCHARS are allowed in a word. |
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
573 Otherwise only a single OTHERCHARS character is allowed to be part of any |
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
574 single word. |
6138 | 575 |
576 ISPELL-ARGS is a list of additional arguments passed to the ispell | |
577 subprocess. | |
578 | |
579 EXTENDED-CHARACTER-MODE should be used when dictionaries are used which | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
580 have been configured in an Ispell affix file. (For example, umlauts |
6138 | 581 can be encoded as \\\"a, a\\\", \"a, ...) Defaults are ~tex and ~nroff |
7607 | 582 in English. This has the same effect as the command-line `-T' option. |
583 The buffer Major Mode controls Ispell's parsing in tex or nroff mode, | |
6138 | 584 but the dictionary can control the extended character mode. |
585 Both defaults can be overruled in a buffer-local fashion. See | |
7607 | 586 `ispell-parsing-keyword' for details on this. |
6138 | 587 |
588 Note that the CASECHARS and OTHERCHARS slots of the alist should | |
589 contain the same character set as casechars and otherchars in the | |
590 language.aff file \(e.g., english.aff\).") | |
591 | |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
592 ;;;###autoload |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
593 (defvar ispell-menu-map nil "Key map for ispell menu") |
6138 | 594 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
595 ;;;###autoload |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
596 (defvar ispell-menu-lucid nil "Spelling menu for Lucid Emacs.") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
597 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
598 ;;; Break out lucid menu and split into several calls to avoid having |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
599 ;;; long lines in loaddefs.el. Detect need off following constant. |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
600 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
601 ;;;###autoload |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
602 (defconst ispell-menu-map-needed ; make sure this is not Lucid Emacs |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
603 (and (not ispell-menu-map) |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
604 ;;; This is commented out because it fails in Emacs. |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
605 ;;; due to the fact that menu-bar is loaded much later than loaddefs. |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
606 ;;; ;; make sure this isn't Lucid Emacs |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
607 ;;; (featurep 'menu-bar) |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
608 (not (string-match "Lucid" emacs-version)))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
609 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
610 ;;; Set up dictionary |
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
611 ;;;###autoload |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
612 (if ispell-menu-map-needed |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
613 (let ((dicts (reverse (cons (cons "default" nil) ispell-dictionary-alist))) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
614 name) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
615 (setq ispell-menu-map (make-sparse-keymap "Spell")) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
616 ;; add the dictionaries to the bottom of the list. |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
617 (while dicts |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
618 (setq name (car (car dicts)) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
619 dicts (cdr dicts)) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
620 (if (stringp name) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
621 (define-key ispell-menu-map (vector (intern name)) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
622 (cons (concat "Select " (capitalize name)) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
623 (list 'lambda () '(interactive) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
624 (list 'ispell-change-dictionary name)))))))) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
625 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
626 ;;; define commands in menu in opposite order you want them to appear. |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
627 ;;;###autoload |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
628 (if ispell-menu-map-needed |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
629 (progn |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
630 (define-key ispell-menu-map [ispell-change-dictionary] |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
631 '("Change Dictionary" . ispell-change-dictionary)) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
632 (define-key ispell-menu-map [ispell-kill-ispell] |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
633 '("Kill Process" . ispell-kill-ispell)) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
634 (define-key ispell-menu-map [ispell-pdict-save] |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
635 '("Save Dictionary" . (lambda () (interactive) (ispell-pdict-save t t)))) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
636 (define-key ispell-menu-map [ispell-complete-word] |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
637 '("Complete Word" . ispell-complete-word)) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
638 (define-key ispell-menu-map [ispell-complete-word-interior-frag] |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
639 '("Complete Word Frag" . ispell-complete-word-interior-frag)))) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
640 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
641 ;;;###autoload |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
642 (if ispell-menu-map-needed |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
643 (progn |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
644 (define-key ispell-menu-map [ispell-continue] |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
645 '("Continue Check" . ispell-continue)) |
8822
33a3f424c8c3
(ispell-menu-map): Order menu items by size: buffer > region > word.
Karl Heuer <kwzh@gnu.org>
parents:
8803
diff
changeset
|
646 (define-key ispell-menu-map [ispell-word] |
33a3f424c8c3
(ispell-menu-map): Order menu items by size: buffer > region > word.
Karl Heuer <kwzh@gnu.org>
parents:
8803
diff
changeset
|
647 '("Check Word" . ispell-word)) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
648 (define-key ispell-menu-map [ispell-region] |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
649 '("Check Region" . ispell-region)) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
650 (define-key ispell-menu-map [ispell-buffer] |
8725
e4e6dc1e1be8
Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents:
8676
diff
changeset
|
651 '("Check Buffer" . ispell-buffer)))) |
e4e6dc1e1be8
Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents:
8676
diff
changeset
|
652 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
653 ;;;###autoload |
8725
e4e6dc1e1be8
Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents:
8676
diff
changeset
|
654 (if ispell-menu-map-needed |
e4e6dc1e1be8
Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents:
8676
diff
changeset
|
655 (progn |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
656 (define-key ispell-menu-map [ispell-message] |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
657 '("Check Message" . ispell-message)) |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
658 (define-key ispell-menu-map [ispell-help] |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
659 ;; use (x-popup-menu last-nonmenu-event(list "" ispell-help-list)) ? |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
660 '("Help" . (lambda () (interactive) (describe-function 'ispell-help)))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
661 (put 'ispell-region 'menu-enable 'mark-active) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
662 (fset 'ispell-menu-map (symbol-value 'ispell-menu-map)))) |
7606 | 663 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
664 ;;; Xemacs version 19 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
665 (if (and (string-lessp "19" emacs-version) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
666 (string-match "Lucid" emacs-version)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
667 (let ((dicts (cons (cons "default" nil) ispell-dictionary-alist)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
668 (current-menubar (or current-menubar default-menubar)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
669 (menu |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
670 '(["Help" (describe-function 'ispell-help) t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
671 ;;["Help" (popup-menu ispell-help-list) t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
672 ["Check Message" ispell-message t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
673 ["Check Buffer" ispell-buffer t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
674 ["Check Word" ispell-word t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
675 ["Check Region" ispell-region (or (not zmacs-regions) (mark))] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
676 ["Continue Check" ispell-continue t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
677 ["Complete Word Frag"ispell-complete-word-interior-frag t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
678 ["Complete Word" ispell-complete-word t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
679 ["Kill Process" ispell-kill-ispell t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
680 "-" |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
681 ["Save Dictionary" (ispell-pdict-save t t) t] |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
682 ["Change Dictionary" ispell-change-dictionary t])) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
683 name) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
684 (while dicts |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
685 (setq name (car (car dicts)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
686 dicts (cdr dicts)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
687 (if (stringp name) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
688 (setq menu (append menu |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
689 (list |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
690 (vector (concat "Select " (capitalize name)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
691 (list 'ispell-change-dictionary name) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
692 t)))))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
693 (setq ispell-menu-lucid menu) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
694 (if current-menubar |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
695 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
696 (delete-menu-item '("Edit" "Spell")) ; in case already defined |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
697 (add-menu '("Edit") "Spell" ispell-menu-lucid))))) |
6138 | 698 |
699 | |
700 ;;; ********************************************************************** | |
701 ;;; The following are used by ispell, and should not be changed. | |
702 ;;; ********************************************************************** | |
703 | |
704 | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
705 ;;; The version must be 3.1 or greater for this version of ispell.el |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
706 ;;; There is an incompatibility between version 3.1.12 and lower versions. |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
707 (defconst ispell-required-version '("3.1." 12) |
6138 | 708 "Ispell versions with which this version of ispell.el is known to work.") |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
709 (defvar ispell-offset 1 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
710 "Offset that maps protocol differences between ispell 3.1 versions.") |
6138 | 711 |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
712 (defun ispell-decode-string (str) |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
713 (let (coding-system) |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
714 (if (and enable-multibyte-characters |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
715 (setq coding-system (ispell-get-coding-system))) |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
716 (decode-coding-string str coding-system) |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
717 str))) |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
718 |
6138 | 719 (defun ispell-get-casechars () |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
720 (ispell-decode-string |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
721 (nth 1 (assoc ispell-dictionary ispell-dictionary-alist)))) |
6138 | 722 (defun ispell-get-not-casechars () |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
723 (ispell-decode-string |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
724 (nth 2 (assoc ispell-dictionary ispell-dictionary-alist)))) |
6138 | 725 (defun ispell-get-otherchars () |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
726 (ispell-decode-string |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
727 (nth 3 (assoc ispell-dictionary ispell-dictionary-alist)))) |
6138 | 728 (defun ispell-get-many-otherchars-p () |
729 (nth 4 (assoc ispell-dictionary ispell-dictionary-alist))) | |
730 (defun ispell-get-ispell-args () | |
731 (nth 5 (assoc ispell-dictionary ispell-dictionary-alist))) | |
732 (defun ispell-get-extended-character-mode () | |
733 (nth 6 (assoc ispell-dictionary ispell-dictionary-alist))) | |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
734 (defun ispell-get-coding-system () |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
735 (nth 7 (assoc ispell-dictionary ispell-dictionary-alist))) |
6138 | 736 |
737 (defvar ispell-process nil | |
7607 | 738 "The process object for Ispell.") |
6138 | 739 |
740 (defvar ispell-pdict-modified-p nil | |
7607 | 741 "Non-nil means personal dictionary has modifications to be saved.") |
6138 | 742 |
743 ;;; If you want to save the dictionary when quitting, must do so explicitly. | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
744 ;;; When non-nil, the spell session is terminated. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
745 ;;; When numeric, contains cursor location in buffer, and cursor remains there. |
7607 | 746 (defvar ispell-quit nil) |
6138 | 747 |
748 (defvar ispell-filter nil | |
7607 | 749 "Output filter from piped calls to Ispell.") |
6138 | 750 |
751 (defvar ispell-filter-continue nil | |
7607 | 752 "Control variable for Ispell filter function.") |
6138 | 753 |
754 (defvar ispell-process-directory nil | |
7607 | 755 "The directory where `ispell-process' was started.") |
6138 | 756 |
757 (defvar ispell-query-replace-marker (make-marker) | |
7607 | 758 "Marker for `query-replace' processing.") |
6138 | 759 |
760 (defvar ispell-checking-message nil | |
761 "Non-nil when we're checking a mail message") | |
762 | |
763 (defconst ispell-choices-buffer "*Choices*") | |
764 | |
7607 | 765 (defvar ispell-overlay nil "Overlay variable for Ispell highlighting.") |
6138 | 766 |
767 ;;; *** Buffer Local Definitions *** | |
768 | |
769 ;;; This is the local dictionary to use. When nil the default dictionary will | |
770 ;;; be used. Do not redefine default value or it will override the global! | |
771 (defvar ispell-local-dictionary nil | |
7607 | 772 "If non-nil, a dictionary to use for Ispell commands in this buffer. |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
773 The value must be a string dictionary name in `ispell-dictionary-alist'. |
7607 | 774 This variable becomes buffer-local when set in any fashion. |
775 | |
776 Setting ispell-local-dictionary to a value has the same effect as | |
777 calling \\[ispell-change-dictionary] with that value. This variable | |
778 is automatically set when defined in the file with either | |
779 `ispell-dictionary-keyword' or the Local Variable syntax.") | |
6138 | 780 |
781 (make-variable-buffer-local 'ispell-local-dictionary) | |
782 | |
783 ;; Use default directory, unless locally set. | |
784 (set-default 'ispell-local-dictionary nil) | |
785 | |
786 (defconst ispell-words-keyword "LocalWords: " | |
787 "The keyword for local oddly-spelled words to accept. | |
788 The keyword will be followed by any number of local word spellings. | |
789 There can be multiple of these keywords in the file.") | |
790 | |
791 (defconst ispell-dictionary-keyword "Local IspellDict: " | |
792 "The keyword for local dictionary definitions. | |
793 There should be only one dictionary keyword definition per file, and it | |
7607 | 794 should be followed by a correct dictionary name in `ispell-dictionary-alist'.") |
6138 | 795 |
796 (defconst ispell-parsing-keyword "Local IspellParsing: " | |
7607 | 797 "The keyword for overriding default Ispell parsing. |
7606 | 798 Determined by the buffer's major mode and extended-character mode as well as |
799 the default dictionary. | |
6138 | 800 |
801 The above keyword string should be followed by `latex-mode' or | |
802 `nroff-mode' to put the current buffer into the desired parsing mode. | |
803 | |
804 Extended character mode can be changed for this buffer by placing | |
805 a `~' followed by an extended-character mode -- such as `~.tex'.") | |
806 | |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
807 (defvar ispell-skip-sgml nil |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
808 "Skips spell checking of SGML tags and entity references when non-nil. |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
809 This variable is set when major-mode is sgml-mode or html-mode.") |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
810 |
6138 | 811 (defvar ispell-local-pdict ispell-personal-dictionary |
7606 | 812 "A buffer local variable containing the current personal dictionary. |
7607 | 813 If non-nil, the value must be a string, which is a file name. |
814 | |
815 If you specify a personal dictionary for the current buffer which is | |
816 different from the current personal dictionary, the effect is similar | |
7606 | 817 to calling \\[ispell-change-dictionary]. This variable is automatically |
7607 | 818 set when defined in the file with either `ispell-pdict-keyword' or the |
819 local variable syntax.") | |
6138 | 820 |
821 (make-variable-buffer-local 'ispell-local-pdict) | |
822 | |
823 (defconst ispell-pdict-keyword "Local IspellPersDict: " | |
824 "The keyword for defining buffer local dictionaries.") | |
825 | |
826 (defvar ispell-buffer-local-name nil | |
827 "Contains the buffer name if local word definitions were used. | |
828 Ispell is then restarted because the local words could conflict.") | |
829 | |
830 (defvar ispell-parser 'use-mode-name | |
831 "*Indicates whether ispell should parse the current buffer as TeX Code. | |
7607 | 832 Special value `use-mode-name' tries to guess using the name of major-mode. |
6138 | 833 Default parser is 'nroff. |
834 Currently the only other valid parser is 'tex. | |
835 | |
836 You can set this variable in hooks in your init file -- eg: | |
837 | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
838 (add-hook 'tex-mode-hook (function (lambda () (setq ispell-parser 'tex))))") |
6138 | 839 |
840 (defvar ispell-region-end (make-marker) | |
841 "Marker that allows spelling continuations.") | |
842 | |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
843 (defvar ispell-check-only nil |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
844 "If non-nil, `ispell-word' does not try to correct the word.") |
6138 | 845 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
846 |
6138 | 847 ;;; ********************************************************************** |
848 ;;; ********************************************************************** | |
849 | |
850 | |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
851 (and (string-lessp "19" emacs-version) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
852 (not (boundp 'epoch::version)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
853 (defalias 'ispell 'ispell-buffer)) |
7606 | 854 |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
855 ;;;###autoload |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
856 (define-key global-map "\M-$" 'ispell-word) |
6839 | 857 |
6138 | 858 ;;;###autoload |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
859 (defun ispell-word (&optional following quietly continue) |
6138 | 860 "Check spelling of word under or before the cursor. |
7607 | 861 If the word is not found in dictionary, display possible corrections |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
862 in a window allowing you to choose one. |
7607 | 863 |
7606 | 864 With a prefix argument (or if CONTINUE is non-nil), |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
865 resume interrupted spell-checking of a buffer or region. |
7607 | 866 |
7606 | 867 If optional argument FOLLOWING is non-nil or if `ispell-following-word' |
6138 | 868 is non-nil when called interactively, then the following word |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
869 \(rather than preceding\) is checked when the cursor is not over a word. |
7606 | 870 When the optional argument QUIETLY is non-nil or `ispell-quietly' is non-nil |
6138 | 871 when called interactively, non-corrective messages are suppressed. |
872 | |
7606 | 873 Word syntax described by `ispell-dictionary-alist' (which see). |
6138 | 874 |
875 This will check or reload the dictionary. Use \\[ispell-change-dictionary] | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
876 or \\[ispell-region] to update the Ispell process." |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
877 (interactive (list nil nil current-prefix-arg)) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
878 (if continue |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
879 (ispell-continue) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
880 (if (interactive-p) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
881 (setq following ispell-following-word |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
882 quietly ispell-quietly)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
883 (ispell-accept-buffer-local-defs) ; use the correct dictionary |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
884 (let ((cursor-location (point)) ; retain cursor location |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
885 (word (ispell-get-word following)) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
886 start end poss replace) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
887 ;; destructure return word info list. |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
888 (setq start (car (cdr word)) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
889 end (car (cdr (cdr word))) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
890 word (car word)) |
6138 | 891 |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
892 ;; now check spelling of word. |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
893 (or quietly |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
894 (message "Checking spelling of %s..." |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
895 (funcall ispell-format-word word))) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
896 (process-send-string ispell-process "%\n") ;put in verbose mode |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
897 (process-send-string ispell-process (concat "^" word "\n")) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
898 ;; wait until ispell has processed word |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
899 (while (progn |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
900 (accept-process-output ispell-process) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
901 (not (string= "" (car ispell-filter))))) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
902 ;;(process-send-string ispell-process "!\n") ;back to terse mode. |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
903 (setq ispell-filter (cdr ispell-filter)) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
904 (if (listp ispell-filter) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
905 (setq poss (ispell-parse-output (car ispell-filter)))) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
906 (cond ((eq poss t) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
907 (or quietly |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
908 (message "%s is correct" (funcall ispell-format-word word)))) |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
909 ((stringp poss) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
910 (or quietly |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
911 (message "%s is correct because of root %s" |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
912 (funcall ispell-format-word word) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
913 (funcall ispell-format-word poss)))) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
914 ((null poss) (message "Error in ispell process")) |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
915 (ispell-check-only ; called from ispell minor mode. |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
916 (beep)) |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
917 (t ; prompt for correct word. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
918 (save-window-excursion |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
919 (setq replace (ispell-command-loop |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
920 (car (cdr (cdr poss))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
921 (car (cdr (cdr (cdr poss)))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
922 (car poss) start end))) |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
923 (cond ((equal 0 replace) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
924 (ispell-add-per-file-word-list (car poss))) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
925 (replace |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
926 (setq word (if (atom replace) replace (car replace)) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
927 cursor-location (+ (- (length word) (- end start)) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
928 cursor-location)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
929 (if (not (equal word (car poss))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
930 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
931 (delete-region start end) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
932 (insert word))) |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
933 (if (not (atom replace)) ; recheck spelling of replacement |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
934 (progn |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
935 (goto-char cursor-location) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
936 (ispell-word following quietly))))) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
937 (if (get-buffer ispell-choices-buffer) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
938 (kill-buffer ispell-choices-buffer)))) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
939 (goto-char cursor-location) ; return to original location |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
940 (ispell-pdict-save ispell-silently-savep) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
941 (if ispell-quit (setq ispell-quit nil))))) |
6138 | 942 |
943 | |
944 (defun ispell-get-word (following &optional extra-otherchars) | |
945 "Return the word for spell-checking according to ispell syntax. | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
946 If optional argument FOLLOWING is non-nil or if `ispell-following-word' |
6138 | 947 is non-nil when called interactively, then the following word |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
948 \(rather than preceding\) is checked when the cursor is not over a word. |
7606 | 949 Optional second argument contains otherchars that can be included in word |
6138 | 950 many times. |
951 | |
7606 | 952 Word syntax described by `ispell-dictionary-alist' (which see)." |
6138 | 953 (let* ((ispell-casechars (ispell-get-casechars)) |
954 (ispell-not-casechars (ispell-get-not-casechars)) | |
955 (ispell-otherchars (ispell-get-otherchars)) | |
956 (ispell-many-otherchars-p (ispell-get-many-otherchars-p)) | |
957 (word-regexp (concat ispell-casechars | |
958 "+\\(" | |
959 ispell-otherchars | |
960 "?" | |
961 (if extra-otherchars | |
962 (concat extra-otherchars "?")) | |
963 ispell-casechars | |
964 "+\\)" | |
965 (if (or ispell-many-otherchars-p | |
966 extra-otherchars) | |
967 "*" "?"))) | |
968 did-it-once | |
969 start end word) | |
970 ;; find the word | |
971 (if (not (looking-at ispell-casechars)) | |
972 (if following | |
973 (re-search-forward ispell-casechars (point-max) t) | |
974 (re-search-backward ispell-casechars (point-min) t))) | |
975 ;; move to front of word | |
976 (re-search-backward ispell-not-casechars (point-min) 'start) | |
977 (while (and (or (looking-at ispell-otherchars) | |
978 (and extra-otherchars (looking-at extra-otherchars))) | |
979 (not (bobp)) | |
980 (or (not did-it-once) | |
981 ispell-many-otherchars-p)) | |
982 (if (and extra-otherchars (looking-at extra-otherchars)) | |
983 (progn | |
984 (backward-char 1) | |
985 (if (looking-at ispell-casechars) | |
986 (re-search-backward ispell-not-casechars (point-min) 'move))) | |
987 (setq did-it-once t) | |
988 (backward-char 1) | |
989 (if (looking-at ispell-casechars) | |
990 (re-search-backward ispell-not-casechars (point-min) 'move) | |
991 (backward-char -1)))) | |
992 ;; Now mark the word and save to string. | |
993 (or (re-search-forward word-regexp (point-max) t) | |
994 (error "No word found to check!")) | |
995 (setq start (match-beginning 0) | |
996 end (point) | |
20089
5da6e31f3b24
(ispell-change-dictionary): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
19828
diff
changeset
|
997 word (buffer-substring-no-properties start end)) |
6138 | 998 (list word start end))) |
999 | |
1000 | |
1001 ;;; Global ispell-pdict-modified-p is set by ispell-command-loop and | |
1002 ;;; tracks changes in the dictionary. The global may either be | |
1003 ;;; a value or a list, whose value is the state of whether the | |
1004 ;;; dictionary needs to be saved. | |
1005 | |
1006 (defun ispell-pdict-save (&optional no-query force-save) | |
1007 "Check to see if the personal dictionary has been modified. | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1008 If so, ask if it needs to be saved." |
6138 | 1009 (interactive (list ispell-silently-savep t)) |
1010 (if (and ispell-pdict-modified-p (listp ispell-pdict-modified-p)) | |
1011 (setq ispell-pdict-modified-p (car ispell-pdict-modified-p))) | |
1012 (if (or ispell-pdict-modified-p force-save) | |
1013 (if (or no-query (y-or-n-p "Personal dictionary modified. Save? ")) | |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1014 (progn |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1015 (process-send-string ispell-process "#\n") |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1016 (message "Personal dictionary saved.")))) |
6138 | 1017 ;; unassert variable, even if not saved to avoid questioning. |
1018 (setq ispell-pdict-modified-p nil)) | |
1019 | |
1020 | |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1021 (defun ispell-command-loop (miss guess word start end) |
6138 | 1022 "Display possible corrections from list MISS. |
1023 GUESS lists possibly valid affix construction of WORD. | |
1024 Returns nil to keep word. | |
7606 | 1025 Returns 0 to insert locally into buffer-local dictionary. |
1026 Returns string for new chosen word. | |
1027 Returns list for new replacement word (will be rechecked). | |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1028 Highlights the word, which is assumed to run from START to END. |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1029 Global `ispell-pdict-modified-p' becomes a list where the only value |
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1030 indicates whether the dictionary has been modified when option `a' or `i' is |
6138 | 1031 used." |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1032 (let ((textbuf (current-buffer)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1033 (count ?0) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1034 (line 2) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1035 (max-lines (- (window-height) 4)) ; assure 4 context lines. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1036 (choices miss) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1037 (window-min-height (min window-min-height |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1038 ispell-choices-win-default-height)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1039 (command-characters '( ? ?i ?a ?A ?r ?R ?? ?x ?X ?q ?l ?u ?m )) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1040 (skipped 0) |
19785 | 1041 (window (selected-window)) |
1042 (dedicated (window-dedicated-p (selected-window))) | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1043 char num result textwin highlighted) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1044 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1045 ;; setup the *Choices* buffer with valid data. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1046 (save-excursion |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1047 (set-buffer (get-buffer-create ispell-choices-buffer)) |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1048 (setq mode-line-format (concat "-- %b -- word: " word)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1049 (erase-buffer) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1050 (if guess |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1051 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1052 (insert "Affix rules generate and capitalize " |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1053 "this word as shown below:\n\t") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1054 (while guess |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1055 (if (> (+ 4 (current-column) (length (car guess))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1056 (window-width)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1057 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1058 (insert "\n\t") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1059 (setq line (1+ line)))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1060 (insert (car guess) " ") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1061 (setq guess (cdr guess))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1062 (insert "\nUse option `i' if this is a correct composition" |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1063 " from the derivative root.\n") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1064 (setq line (+ line (if choices 3 2))))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1065 (while (and choices |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1066 (< (if (> (+ 7 (current-column) (length (car choices)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1067 (if (> count ?~) 3 0)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1068 (window-width)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1069 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1070 (insert "\n") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1071 (setq line (1+ line))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1072 line) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1073 max-lines)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1074 ;; not so good if there are over 20 or 30 options, but then, if |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1075 ;; there are that many you don't want to scan them all anyway... |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1076 (while (memq count command-characters) ; skip command characters. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1077 (setq count (1+ count) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1078 skipped (1+ skipped))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1079 (insert "(" count ") " (car choices) " ") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1080 (setq choices (cdr choices) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1081 count (1+ count))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1082 (setq count (- count ?0 skipped))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1083 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1084 ;; Assure word is visible |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1085 (if (not (pos-visible-in-window-p end)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1086 (sit-for 0)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1087 ;; Display choices for misspelled word. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1088 (let ((choices-window (get-buffer-window ispell-choices-buffer))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1089 (if choices-window |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1090 (if (= line (window-height choices-window)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1091 (select-window choices-window) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1092 ;; *Choices* window changed size. Adjust the choices window |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1093 ;; without scrolling the spelled window when possible |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1094 (let ((window-line (- line (window-height choices-window))) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1095 (visible (progn (forward-line -1) (point)))) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1096 (if (< line ispell-choices-win-default-height) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1097 (setq window-line (+ window-line |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1098 (- ispell-choices-win-default-height |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1099 line)))) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1100 (move-to-window-line 0) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1101 (forward-line window-line) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1102 (set-window-start (selected-window) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1103 (if (> (point) visible) visible (point))) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1104 (goto-char end) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1105 (select-window (previous-window)) ; *Choices* window |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1106 (enlarge-window window-line))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1107 ;; Overlay *Choices* window when it isn't showing |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1108 (ispell-overlay-window (max line ispell-choices-win-default-height))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1109 (switch-to-buffer ispell-choices-buffer) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1110 (goto-char (point-min))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1111 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1112 (select-window (setq textwin (next-window))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1113 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1114 ;; highlight word, protecting current buffer status |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1115 (unwind-protect |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1116 (progn |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1117 (if ispell-highlight-p |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1118 (ispell-highlight-spelling-error start end t)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1119 ;; Loop until a valid choice is made. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1120 (while |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1121 (eq |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1122 t |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1123 (setq |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1124 result |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1125 (progn |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1126 (undo-boundary) |
17143
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1127 (let (message-log-max) |
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1128 (message (concat "C-h or ? for more options; SPC to leave " |
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1129 "unchanged, Character to replace word"))) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1130 (let ((inhibit-quit t)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1131 (setq char (if (fboundp 'read-char-exclusive) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1132 (read-char-exclusive) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1133 (read-char)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1134 skipped 0) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1135 (if (or quit-flag (= char ?\C-g)) ; C-g is like typing X |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1136 (setq char ?X |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1137 quit-flag nil))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1138 ;; Adjust num to array offset skipping command characters. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1139 (let ((com-chars command-characters)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1140 (while com-chars |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1141 (if (and (> (car com-chars) ?0) (< (car com-chars) char)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1142 (setq skipped (1+ skipped))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1143 (setq com-chars (cdr com-chars))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1144 (setq num (- char ?0 skipped))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1145 |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1146 (cond |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1147 ((= char ? ) nil) ; accept word this time only |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1148 ((= char ?i) ; accept and insert word into pers dict |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1149 (process-send-string ispell-process (concat "*" word "\n")) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1150 (setq ispell-pdict-modified-p '(t)) ; dictionary modified! |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1151 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1152 ((or (= char ?a) (= char ?A)) ; accept word without insert |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1153 (process-send-string ispell-process (concat "@" word "\n")) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1154 (if (null ispell-pdict-modified-p) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1155 (setq ispell-pdict-modified-p |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1156 (list ispell-pdict-modified-p))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1157 (if (= char ?A) 0)) ; return 0 for ispell-add buffer-local |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1158 ((or (= char ?r) (= char ?R)) ; type in replacement |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1159 (if (or (= char ?R) ispell-query-replace-choices) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1160 (list (read-string "Query-replacement for: " word) t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1161 (cons (read-string "Replacement for: " word) nil))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1162 ((or (= char ??) (= char help-char) (= char ?\C-h)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1163 (ispell-help) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1164 t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1165 ;; Quit and move point back. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1166 ((= char ?x) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1167 (ispell-pdict-save ispell-silently-savep) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1168 (message "Exited spell-checking") |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1169 (setq ispell-quit t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1170 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1171 ;; Quit and preserve point. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1172 ((= char ?X) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1173 (ispell-pdict-save ispell-silently-savep) |
14388
b7708fc4d023
(ispell-command-loop, ispell-region): Pass proper format string to message.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1174 (message "%s" |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1175 (substitute-command-keys |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1176 (concat "Spell-checking suspended;" |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1177 " use C-u \\[ispell-word] to resume"))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1178 (setq ispell-quit (max (point-min) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1179 (- (point) (length word)))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1180 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1181 ((= char ?q) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1182 (if (y-or-n-p "Really kill Ispell process? ") |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1183 (progn |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1184 (ispell-kill-ispell t) ; terminate process. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1185 (setq ispell-quit (or (not ispell-checking-message) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1186 (point)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1187 ispell-pdict-modified-p nil)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1188 t)) ; continue if they don't quit. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1189 ((= char ?l) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1190 (let ((new-word (read-string |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1191 "Lookup string (`*' is wildcard): " |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1192 word)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1193 (new-line 2)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1194 (if new-word |
6138 | 1195 (progn |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1196 (save-excursion |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1197 (set-buffer (get-buffer-create |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1198 ispell-choices-buffer)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1199 (erase-buffer) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1200 (setq count ?0 |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1201 skipped 0 |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1202 mode-line-format (concat |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1203 "-- %b -- word: " |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1204 new-word) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1205 miss (lookup-words new-word) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1206 choices miss) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1207 (while (and choices ; adjust choices window. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1208 (< (if (> (+ 7 (current-column) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1209 (length (car choices)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1210 (if (> count ?~) 3 0)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1211 (window-width)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1212 (progn |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1213 (insert "\n") |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1214 (setq new-line |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1215 (1+ new-line))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1216 new-line) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1217 max-lines)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1218 (while (memq count command-characters) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1219 (setq count (1+ count) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1220 skipped (1+ skipped))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1221 (insert "(" count ") " (car choices) " ") |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1222 (setq choices (cdr choices) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1223 count (1+ count))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1224 (setq count (- count ?0 skipped))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1225 (select-window (previous-window)) |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1226 (if (and (/= new-line line) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1227 (> (max line new-line) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1228 ispell-choices-win-default-height)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1229 (let* ((minh ispell-choices-win-default-height) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1230 (gr-bl (if (< line minh) ; blanks |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1231 (- minh line) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1232 0)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1233 (shr-bl (if (< new-line minh) ; blanks |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1234 (- minh new-line) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1235 0))) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1236 (if (> new-line line) |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1237 (enlarge-window (- new-line line gr-bl)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1238 (shrink-window (- line new-line shr-bl))) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1239 (setq line new-line))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1240 (select-window (next-window))))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1241 t) ; reselect from new choices |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1242 ((= char ?u) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1243 (process-send-string ispell-process |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1244 (concat "*" (downcase word) "\n")) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1245 (setq ispell-pdict-modified-p '(t)) ; dictionary modified! |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1246 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1247 ((= char ?m) ; type in what to insert |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1248 (process-send-string |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1249 ispell-process (concat "*" (read-string "Insert: " word) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1250 "\n")) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1251 (setq ispell-pdict-modified-p '(t)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1252 (cons word nil)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1253 ((and (>= num 0) (< num count)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1254 (if ispell-query-replace-choices ; Query replace flag |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1255 (list (nth num miss) 'query-replace) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1256 (nth num miss))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1257 ((= char ?\C-l) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1258 (redraw-display) t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1259 ((= char ?\C-r) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1260 (save-window-excursion (recursive-edit)) t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1261 ((= char ?\C-z) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1262 (funcall (key-binding "\C-z")) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1263 t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1264 (t (ding) t)))))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1265 result) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1266 ;; protected |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1267 (if ispell-highlight-p ; unhighlight |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1268 (save-window-excursion |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1269 (select-window textwin) |
19785 | 1270 (ispell-highlight-spelling-error start end))) |
1271 (set-window-dedicated-p window dedicated)))) | |
6138 | 1272 |
1273 | |
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
1274 ;;;###autoload |
6138 | 1275 (defun ispell-help () |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1276 "Display a list of the options available when a misspelling is encountered. |
6138 | 1277 |
1278 Selections are: | |
1279 | |
1280 DIGIT: Replace the word with a digit offered in the *Choices* buffer. | |
7607 | 1281 SPC: Accept word this time. |
1282 `i': Accept word and insert into private dictionary. | |
1283 `a': Accept word for this session. | |
1284 `A': Accept word and place in `buffer-local dictionary'. | |
1285 `r': Replace word with typed-in value. Rechecked. | |
1286 `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. | |
1287 `?': Show these commands. | |
1288 `x': Exit spelling buffer. Move cursor to original point. | |
1289 `X': Exit spelling buffer. Leaves cursor at the current point, and permits | |
6138 | 1290 the aborted check to be completed later. |
7607 | 1291 `q': Quit spelling session (Kills ispell process). |
1292 `l': Look up typed-in replacement in alternate dictionary. Wildcards okay. | |
1293 `u': Like `i', but the word is lower-cased first. | |
1294 `m': Like `i', but allows one to include dictionary completion information. | |
1295 `C-l': redraws screen | |
1296 `C-r': recursive edit | |
1297 `C-z': suspend emacs or iconify frame" | |
6138 | 1298 |
7606 | 1299 (let ((help-1 (concat "[r/R]eplace word; [a/A]ccept for this session; " |
1300 "[i]nsert into private dictionary")) | |
1301 (help-2 (concat "[l]ook a word up in alternate dictionary; " | |
1302 "e[x/X]it; [q]uit session")) | |
1303 (help-3 (concat "[u]ncapitalized insert into dictionary. " | |
1304 "Type 'C-h d ispell-help' for more help"))) | |
6138 | 1305 (save-window-excursion |
1306 (if ispell-help-in-bufferp | |
1307 (progn | |
1308 (ispell-overlay-window 4) | |
1309 (switch-to-buffer (get-buffer-create "*Ispell Help*")) | |
1310 (insert (concat help-1 "\n" help-2 "\n" help-3)) | |
1311 (sit-for 5) | |
1312 (kill-buffer "*Ispell Help*")) | |
1313 (select-window (minibuffer-window)) | |
7606 | 1314 ;;(enlarge-window 2) |
6138 | 1315 (erase-buffer) |
1316 (cond ((string-match "Lucid" emacs-version) | |
1317 (message help-3) | |
1318 (enlarge-window 1) | |
1319 (message help-2) | |
1320 (enlarge-window 1) | |
7606 | 1321 (message help-1) |
1322 (goto-char (point-min))) | |
6138 | 1323 (t |
7606 | 1324 (if (string-lessp "19" emacs-version) |
6138 | 1325 (message nil)) |
1326 (enlarge-window 2) | |
14389
f349b035e009
(ispell-help): Use set-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
14388
diff
changeset
|
1327 ;; Make sure we display the minibuffer |
f349b035e009
(ispell-help): Use set-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
14388
diff
changeset
|
1328 ;; in this window, not some other. |
f349b035e009
(ispell-help): Use set-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
14388
diff
changeset
|
1329 (set-minibuffer-window (selected-window)) |
6138 | 1330 (insert (concat help-1 "\n" help-2 "\n" help-3)))) |
1331 (sit-for 5) | |
1332 (erase-buffer))))) | |
1333 | |
1334 | |
1335 (defun lookup-words (word &optional lookup-dict) | |
1336 "Look up word in word-list dictionary. | |
7606 | 1337 A `*' serves as a wild card. If no wild cards, `look' is used if it exists. |
1338 Otherwise the variable `ispell-grep-command' contains the command used to | |
1339 search for the words (usually egrep). | |
1340 | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1341 Optional second argument contains the dictionary to use; the default is |
7606 | 1342 `ispell-alternate-dictionary'." |
6138 | 1343 ;; We don't use the filter for this function, rather the result is written |
1344 ;; into a buffer. Hence there is no need to save the filter values. | |
1345 (if (null lookup-dict) | |
1346 (setq lookup-dict ispell-alternate-dictionary)) | |
1347 | |
1348 (let* ((process-connection-type ispell-use-ptys-p) | |
1349 (wild-p (string-match "\\*" word)) | |
1350 (look-p (and ispell-look-p ; Only use look for an exact match. | |
1351 (or ispell-have-new-look (not wild-p)))) | |
1352 (ispell-grep-buffer (get-buffer-create "*Ispell-Temp*")) ; result buf | |
1353 (prog (if look-p ispell-look-command ispell-grep-command)) | |
1354 (args (if look-p ispell-look-options ispell-grep-options)) | |
1355 status results loc) | |
1356 (unwind-protect | |
1357 (save-window-excursion | |
1358 (message "Starting \"%s\" process..." (file-name-nondirectory prog)) | |
1359 (set-buffer ispell-grep-buffer) | |
1360 (if look-p | |
1361 nil | |
1362 ;; convert * to .* | |
1363 (insert "^" word "$") | |
1364 (while (search-backward "*" nil t) (insert ".")) | |
1365 (setq word (buffer-string)) | |
1366 (erase-buffer)) | |
1367 (setq status (call-process prog nil t nil args word lookup-dict)) | |
1368 ;; grep returns status 1 and no output when word not found, which | |
1369 ;; is a perfectly normal thing. | |
1370 (if (stringp status) | |
1371 (setq results (cons (format "error: %s exited with signal %s" | |
1372 (file-name-nondirectory prog) status) | |
1373 results)) | |
1374 ;; else collect words into `results' in FIFO order | |
1375 (goto-char (point-max)) | |
1376 ;; assure we've ended with \n | |
1377 (or (bobp) (= (preceding-char) ?\n) (insert ?\n)) | |
1378 (while (not (bobp)) | |
1379 (setq loc (point)) | |
1380 (forward-line -1) | |
1381 (setq results (cons (buffer-substring (point) (1- loc)) | |
1382 results))))) | |
1383 ;; protected | |
1384 (kill-buffer ispell-grep-buffer) | |
1385 (if (and results (string-match ".+: " (car results))) | |
1386 (error "%s error: %s" ispell-grep-command (car results)))) | |
1387 results)) | |
1388 | |
1389 | |
1390 ;;; "ispell-filter" is a list of output lines from the generating function. | |
1391 ;;; Each full line (ending with \n) is a separate item on the list. | |
1392 ;;; "output" can contain multiple lines, part of a line, or both. | |
1393 ;;; "start" and "end" are used to keep bounds on lines when "output" contains | |
1394 ;;; multiple lines. | |
1395 ;;; "ispell-filter-continue" is true when we have received only part of a | |
1396 ;;; line as output from a generating function ("output" did not end with \n) | |
14040 | 1397 ;;; THIS FUNCTION WILL FAIL IF THE PROCESS OUTPUT DOESN'T END WITH \n! |
6138 | 1398 ;;; This is the case when a process dies or fails. The default behavior |
1399 ;;; in this case treats the next input received as fresh input. | |
1400 | |
1401 (defun ispell-filter (process output) | |
1402 "Output filter function for ispell, grep, and look." | |
1403 (let ((start 0) | |
1404 (continue t) | |
1405 end) | |
1406 (while continue | |
1407 (setq end (string-match "\n" output start)) ; get text up to the newline. | |
1408 ;; If we get out of sync and ispell-filter-continue is asserted when we | |
1409 ;; are not continuing, treat the next item as a separate list. When | |
1410 ;; ispell-filter-continue is asserted, ispell-filter *should* always be a | |
1411 ;; list! | |
1412 | |
1413 ;; Continue with same line (item)? | |
1414 (if (and ispell-filter-continue ispell-filter (listp ispell-filter)) | |
1415 ;; Yes. Add it to the prev item | |
1416 (setcar ispell-filter | |
1417 (concat (car ispell-filter) (substring output start end))) | |
1418 ;; No. This is a new line and item. | |
1419 (setq ispell-filter | |
1420 (cons (substring output start end) ispell-filter))) | |
1421 (if (null end) | |
1422 ;; We've completed reading the output, but didn't finish the line. | |
1423 (setq ispell-filter-continue t continue nil) | |
1424 ;; skip over newline, this line complete. | |
1425 (setq ispell-filter-continue nil end (1+ end)) | |
1426 (if (= end (length output)) ; No more lines in output | |
1427 (setq continue nil) ; so we can exit the filter. | |
1428 (setq start end)))))) ; else move start to next line of input | |
1429 | |
1430 | |
1431 ;;; This function destroys the mark location if it is in the word being | |
1432 ;;; highlighted. | |
7606 | 1433 (defun ispell-highlight-spelling-error-generic (start end &optional highlight) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1434 "Highlight the word from START to END with a kludge using `inverse-video'. |
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1435 When the optional third arg HIGHLIGHT is set, the word is highlighted; |
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1436 otherwise it is displayed normally." |
6138 | 1437 (let ((modified (buffer-modified-p)) ; don't allow this fn to modify buffer |
1438 (buffer-read-only nil) ; Allow highlighting read-only buffers. | |
1439 (text (buffer-substring start end)) ; Save highlight region | |
1440 (inhibit-quit t) ; inhibit interrupt processing here. | |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1441 (buffer-undo-list t)) ; don't clutter the undo list. |
6138 | 1442 (delete-region start end) |
14040 | 1443 (insert-char ? (- end start)) ; minimize amount of redisplay |
6138 | 1444 (sit-for 0) ; update display |
1445 (if highlight (setq inverse-video (not inverse-video))) ; toggle video | |
1446 (delete-region start end) ; delete whitespace | |
1447 (insert text) ; insert text in inverse video. | |
1448 (sit-for 0) ; update display showing inverse video. | |
1449 (if highlight (setq inverse-video (not inverse-video))) ; toggle video | |
1450 (set-buffer-modified-p modified))) ; don't modify if flag not set. | |
1451 | |
1452 | |
7606 | 1453 (defun ispell-highlight-spelling-error-lucid (start end &optional highlight) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1454 "Highlight the word from START to END using `isearch-highlight'. |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1455 When the optional third arg HIGHLIGHT is set, the word is highlighted, |
6138 | 1456 otherwise it is displayed normally." |
1457 (if highlight | |
1458 (isearch-highlight start end) | |
1459 (isearch-dehighlight t)) | |
1460 ;;(sit-for 0) | |
1461 ) | |
1462 | |
1463 | |
7606 | 1464 (defun ispell-highlight-spelling-error-overlay (start end &optional highlight) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1465 "Highlight the word from START to END using overlays. |
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1466 When the optional third arg HIGHLIGHT is set, the word is highlighted |
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1467 otherwise it is displayed normally. |
7606 | 1468 |
7607 | 1469 The variable `ispell-highlight-face' selects the face to use for highlighting." |
6138 | 1470 (if highlight |
1471 (progn | |
1472 (setq ispell-overlay (make-overlay start end)) | |
1473 (overlay-put ispell-overlay 'face ispell-highlight-face)) | |
1474 (delete-overlay ispell-overlay))) | |
1475 | |
1476 | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1477 (defun ispell-highlight-spelling-error (start end &optional highlight) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1478 (cond |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1479 ((string-match "Lucid" emacs-version) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1480 (ispell-highlight-spelling-error-lucid start end highlight)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1481 ((and (string-lessp "19" emacs-version) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1482 (featurep 'faces) window-system) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1483 (ispell-highlight-spelling-error-overlay start end highlight)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1484 (t (ispell-highlight-spelling-error-generic start end highlight)))) |
6138 | 1485 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1486 |
6138 | 1487 (defun ispell-overlay-window (height) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1488 "Create a window covering the top HEIGHT lines of the current window. |
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1489 Ensure that the line above point is still visible but otherwise avoid |
8298
0ff871ea99d4
(ispell-command-loop, ispell-region, ispell-word):
Richard M. Stallman <rms@gnu.org>
parents:
8052
diff
changeset
|
1490 scrolling the current window. Leave the new window selected." |
6138 | 1491 (save-excursion |
1492 (let ((oldot (save-excursion (forward-line -1) (point))) | |
1493 (top (save-excursion (move-to-window-line height) (point)))) | |
1494 ;; If line above old point (line starting at olddot) would be | |
1495 ;; hidden by new window, scroll it to just below new win | |
1496 ;; otherwise set top line of other win so it doesn't scroll. | |
1497 (if (< oldot top) (setq top oldot)) | |
7606 | 1498 ;; NB: Lemacs 19.9 bug: If a window of size N (N includes the mode |
1499 ;; line) is demanded, the last line is not visible. | |
1500 ;; At least this happens on AIX 3.2, lemacs w/ Motif, font 9x15. | |
1501 ;; So we increment the height for this case. | |
1502 (if (string-match "19\.9.*Lucid" (emacs-version)) | |
1503 (setq height (1+ height))) | |
19727
546bbd73087a
(ispell-overlay-window): Undo previous change;
Richard M. Stallman <rms@gnu.org>
parents:
19668
diff
changeset
|
1504 (split-window nil height) |
19785 | 1505 ;; The lower of the two windows is the logical successor |
1506 ;; of the original window, so move the dedicated flag to there. | |
1507 ;; The new upper window should not be dedicated. | |
1508 (set-window-dedicated-p (next-window) | |
1509 (window-dedicated-p (selected-window))) | |
1510 (set-window-dedicated-p (selected-window) nil) | |
6138 | 1511 (set-window-start (next-window) top)))) |
1512 | |
1513 | |
1514 ;;; Should we add a compound word match return value? | |
1515 (defun ispell-parse-output (output) | |
7607 | 1516 "Parse the OUTPUT string from Ispell and return: |
1517 1: t for an exact match. | |
6138 | 1518 2: A string containing the root word for a match via suffix removal. |
1519 3: A list of possible correct spellings of the format: | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1520 '(\"ORIGINAL-WORD\" OFFSET MISS-LIST GUESS-LIST) |
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1521 ORIGINAL-WORD is a string of the possibly misspelled word. |
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1522 OFFSET is an integer giving the line offset of the word. |
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1523 MISS-LIST and GUESS-LIST are possibly null lists of guesses and misses." |
6138 | 1524 (cond |
1525 ((string= output "") t) ; for startup with pipes... | |
1526 ((string= output "*") t) ; exact match | |
1527 ((string= output "-") t) ; compound word match | |
1528 ((string= (substring output 0 1) "+") ; found cuz of root word | |
1529 (substring output 2)) ; return root word | |
1530 (t ; need to process &, ?, and #'s | |
1531 (let ((type (substring output 0 1)) ; &, ?, or # | |
1532 (original-word (substring output 2 (string-match " " output 2))) | |
1533 (cur-count 0) ; contains number of misses + guesses | |
1534 count miss-list guess-list offset) | |
1535 (setq output (substring output (match-end 0))) ; skip over misspelling | |
1536 (if (string= type "#") | |
1537 (setq count 0) ; no misses for type # | |
1538 (setq count (string-to-int output) ; get number of misses. | |
1539 output (substring output (1+ (string-match " " output 1))))) | |
1540 (setq offset (string-to-int output)) | |
1541 (if (string= type "#") ; No miss or guess list. | |
1542 (setq output nil) | |
1543 (setq output (substring output (1+ (string-match " " output 1))))) | |
1544 (while output | |
1545 (let ((end (string-match ", \\|\\($\\)" output))) ; end of miss/guess. | |
1546 (setq cur-count (1+ cur-count)) | |
1547 (if (> cur-count count) | |
1548 (setq guess-list (cons (substring output 0 end) guess-list)) | |
1549 (setq miss-list (cons (substring output 0 end) miss-list))) | |
1550 (if (match-end 1) ; True only when at end of line. | |
1551 (setq output nil) ; no more misses or guesses | |
1552 (setq output (substring output (+ end 2)))))) | |
1553 (list original-word offset miss-list guess-list))))) | |
1554 | |
1555 | |
1556 (defun check-ispell-version () | |
1557 ;; This is a little wasteful as we actually launch ispell twice: once | |
1558 ;; to make sure it's the right version, and once for real. But people | |
1559 ;; get confused by version mismatches *all* the time (and I've got the | |
1560 ;; email to prove it) so I think this is worthwhile. And the -v[ersion] | |
1561 ;; option is the only way I can think of to do this that works with | |
1562 ;; all versions, since versions earlier than 3.0.09 didn't identify | |
1563 ;; themselves on startup. | |
1564 (save-excursion | |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1565 (let ((case-fold-search t) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1566 ;; avoid bugs when syntax of `.' changes in various default modes |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1567 (default-major-mode 'fundamental-mode) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1568 status) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1569 (set-buffer (get-buffer-create " *ispell-tmp*")) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1570 (erase-buffer) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1571 (setq status (call-process ispell-program-name nil t nil "-v")) |
6138 | 1572 (goto-char (point-min)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1573 (if (not (memq status '(0 nil))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1574 (error "%s exited with %s %s" ispell-program-name |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1575 (if (stringp status) "signal" "code") status)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1576 (if (not (re-search-forward |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1577 (concat "\\b\\(" |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1578 (regexp-quote (car ispell-required-version)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1579 "\\)\\([0-9]*\\)\\b") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1580 nil t)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1581 (error |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1582 "%s version %s* is required: try renaming ispell4.el to ispell.el" |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1583 ispell-program-name (car ispell-required-version)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1584 ;; check that it is the correct version. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1585 (if (< (car (read-from-string (buffer-substring |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1586 (match-beginning 2) (match-end 2)))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1587 (car (cdr ispell-required-version))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1588 (setq ispell-offset 0))) |
6138 | 1589 (kill-buffer (current-buffer))))) |
1590 | |
1591 | |
1592 (defun ispell-init-process () | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1593 "Check status of Ispell process and start if necessary." |
6138 | 1594 (if (and ispell-process |
1595 (eq (process-status ispell-process) 'run) | |
1596 ;; If we're using a personal dictionary, assure | |
1597 ;; we're in the same default directory! | |
1598 (or (not ispell-personal-dictionary) | |
1599 (equal ispell-process-directory default-directory))) | |
1600 (setq ispell-filter nil ispell-filter-continue nil) | |
1601 ;; may need to restart to select new personal dictionary. | |
1602 (ispell-kill-ispell t) | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1603 (message "Starting new Ispell process...") |
6138 | 1604 (sit-for 0) |
1605 (check-ispell-version) | |
1606 (setq ispell-process | |
1607 (let ((process-connection-type ispell-use-ptys-p)) | |
1608 (apply 'start-process | |
1609 "ispell" nil ispell-program-name | |
1610 "-a" ; accept single input lines | |
1611 "-m" ; make root/affix combos not in dict | |
1612 (let (args) | |
1613 ;; Local dictionary becomes the global dictionary in use. | |
1614 (if ispell-local-dictionary | |
1615 (setq ispell-dictionary ispell-local-dictionary)) | |
1616 (setq args (ispell-get-ispell-args)) | |
1617 (if ispell-dictionary ; use specified dictionary | |
1618 (setq args | |
1619 (append (list "-d" ispell-dictionary) args))) | |
1620 (if ispell-personal-dictionary ; use specified pers dict | |
1621 (setq args | |
1622 (append args | |
1623 (list "-p" | |
1624 (expand-file-name | |
1625 ispell-personal-dictionary))))) | |
7606 | 1626 (setq args (append args ispell-extra-args)) |
6138 | 1627 args))) |
1628 ispell-filter nil | |
1629 ispell-filter-continue nil | |
1630 ispell-process-directory default-directory) | |
1631 (set-process-filter ispell-process 'ispell-filter) | |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1632 (if (and enable-multibyte-characters |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1633 ispell-dictionary) |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1634 (set-process-coding-system ispell-process (ispell-get-coding-system))) |
6138 | 1635 (accept-process-output ispell-process) ; Get version ID line |
1636 (cond ((null ispell-filter) | |
9201
3af00d95faac
(ispell-init-process): Add missing arg in error msg.
Richard M. Stallman <rms@gnu.org>
parents:
9002
diff
changeset
|
1637 (error "%s did not output version line" ispell-program-name)) |
11469
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
1638 ((and |
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
1639 (stringp (car ispell-filter)) |
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
1640 (if (string-match "warning: " (car ispell-filter)) |
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
1641 (progn |
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
1642 (accept-process-output ispell-process 5) ; 1st was warn msg. |
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
1643 (stringp (car ispell-filter))) |
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
1644 (null (cdr ispell-filter))) |
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
1645 (string-match "^@(#) " (car ispell-filter))) |
6138 | 1646 ;; got the version line as expected (we already know it's the right |
1647 ;; version, so don't bother checking again.) | |
1648 nil) | |
1649 (t | |
1650 ;; Otherwise, it must be an error message. Show the user. | |
1651 ;; But first wait to see if some more output is going to arrive. | |
1652 ;; Otherwise we get cool errors like "Can't open ". | |
1653 (sleep-for 1) | |
1654 (accept-process-output) | |
1655 (error "%s" (mapconcat 'identity ispell-filter "\n")))) | |
1656 (setq ispell-filter nil) ; Discard version ID line | |
1657 (let ((extended-char-mode (ispell-get-extended-character-mode))) | |
1658 (if extended-char-mode | |
1659 (process-send-string ispell-process | |
1660 (concat extended-char-mode "\n")))) | |
1661 (process-kill-without-query ispell-process))) | |
1662 | |
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
1663 ;;;###autoload |
6138 | 1664 (defun ispell-kill-ispell (&optional no-error) |
7607 | 1665 "Kill current Ispell process (so that you may start a fresh one). |
1666 With NO-ERROR, just return non-nil if there was no Ispell running." | |
6138 | 1667 (interactive) |
1668 (if (not (and ispell-process | |
1669 (eq (process-status ispell-process) 'run))) | |
1670 (or no-error | |
1671 (error "There is no ispell process running!")) | |
1672 (kill-process ispell-process) | |
1673 (setq ispell-process nil) | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1674 (message "Ispell process killed") |
6138 | 1675 nil)) |
1676 | |
1677 | |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1678 ;;; ispell-change-dictionary is set in some people's hooks. Maybe this should |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1679 ;;; call ispell-init-process rather than wait for a spell checking command? |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1680 |
6138 | 1681 ;;;###autoload |
1682 (defun ispell-change-dictionary (dict &optional arg) | |
7607 | 1683 "Change `ispell-dictionary' (q.v.) and kill old Ispell process. |
6138 | 1684 A new one will be started as soon as necessary. |
1685 | |
1686 By just answering RET you can find out what the current dictionary is. | |
1687 | |
1688 With prefix argument, set the default directory." | |
1689 (interactive | |
1690 (list (completing-read | |
1691 "Use new dictionary (RET for current, SPC to complete): " | |
1692 (cons (cons "default" nil) ispell-dictionary-alist) nil t) | |
1693 current-prefix-arg)) | |
1694 (if (equal dict "default") (setq dict nil)) | |
1695 ;; This relies on completing-read's bug of returning "" for no match | |
1696 (cond ((equal dict "") | |
1697 (message "Using %s dictionary" | |
1698 (or ispell-local-dictionary ispell-dictionary "default"))) | |
1699 ((and (equal dict ispell-dictionary) | |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1700 (or (null ispell-local-dictionary) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1701 (equal dict ispell-local-dictionary))) |
6138 | 1702 ;; Specified dictionary is the default already. No-op |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1703 (and (interactive-p) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1704 (message "No change, using %s dictionary" (or dict "default")))) |
6138 | 1705 (t ; reset dictionary! |
1706 (if (assoc dict ispell-dictionary-alist) | |
1707 (progn | |
1708 (if (or arg (null dict)) ; set default dictionary | |
1709 (setq ispell-dictionary dict)) | |
1710 (if (null arg) ; set local dictionary | |
1711 (setq ispell-local-dictionary dict))) | |
20089
5da6e31f3b24
(ispell-change-dictionary): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
19828
diff
changeset
|
1712 (error "Invalid Ispell dictionary: %s" dict)) |
6138 | 1713 (ispell-kill-ispell t) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1714 (message "(Next %sIspell command will use %s dictionary)" |
6138 | 1715 (cond ((equal ispell-local-dictionary ispell-dictionary) |
1716 "") | |
1717 (arg "global ") | |
1718 (t "local ")) | |
1719 (or (if (or (equal ispell-local-dictionary ispell-dictionary) | |
1720 (null arg)) | |
1721 ispell-local-dictionary | |
1722 ispell-dictionary) | |
1723 "default"))))) | |
1724 | |
1725 | |
1726 ;;; Spelling of comments are checked when ispell-check-comments is non-nil. | |
1727 | |
1728 ;;;###autoload | |
1729 (defun ispell-region (reg-start reg-end) | |
1730 "Interactively check a region for spelling errors." | |
1731 (interactive "r") ; Don't flag errors on read-only bufs. | |
1732 (ispell-accept-buffer-local-defs) ; set up dictionary, local words, etc. | |
1733 (unwind-protect | |
7606 | 1734 (save-excursion |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1735 (message "Spell checking %s using %s dictionary..." |
7606 | 1736 (if (and (= reg-start (point-min)) (= reg-end (point-max))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1737 (buffer-name) "region") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1738 (or ispell-dictionary "default")) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1739 ;; Returns cursor to original location. |
7606 | 1740 (save-window-excursion |
1741 (goto-char reg-start) | |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1742 (let ((transient-mark-mode nil) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1743 ref-type) |
7606 | 1744 (while (and (not ispell-quit) (< (point) reg-end)) |
1745 (let ((start (point)) | |
1746 (offset-change 0) | |
1747 (end (save-excursion (end-of-line) (min (point) reg-end))) | |
1748 (ispell-casechars (ispell-get-casechars)) | |
1749 string) | |
1750 (cond ; LOOK AT THIS LINE AND SKIP OR PROCESS | |
1751 ((eolp) ; END OF LINE, just go to next line. | |
1752 (forward-char 1)) | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1753 ((and (null ispell-check-comments) ; SKIPPING COMMENTS |
7606 | 1754 comment-start ; skip comments that start on the line. |
1755 (search-forward comment-start end t)) ; or found here. | |
1756 (if (= (- (point) start) (length comment-start)) | |
1757 ;; comment starts the line. Skip entire line or region | |
1758 (if (string= "" comment-end) ; skip to next line | |
1759 (beginning-of-line 2) ; or jump to comment end. | |
1760 (search-forward comment-end reg-end 'limit)) | |
1761 ;; Comment later in line. Check spelling before comment. | |
1762 (let ((limit (- (point) (length comment-start)))) | |
1763 (goto-char (1- limit)) | |
1764 (if (looking-at "\\\\") ; "quoted" comment, don't skip | |
1765 ;; quoted comment. Skip over comment-start | |
1766 (if (= start (1- limit)) | |
1767 (setq limit (+ limit (length comment-start))) | |
1768 (setq limit (1- limit)))) | |
1769 (goto-char start) | |
1770 ;; Only check when "casechars" or math before comment | |
1771 (if (or (re-search-forward ispell-casechars limit t) | |
1772 (re-search-forward "[][()$]" limit t)) | |
1773 (setq string | |
1774 (concat "^" (buffer-substring start limit) | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1775 "\n") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1776 offset-change (- offset-change ispell-offset))) |
7606 | 1777 (goto-char limit)))) |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1778 ((looking-at "[---#@*+!%~^]") ; SKIP SPECIAL ISPELL CHARACTERS |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1779 (forward-char 1)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1780 ((or (and ispell-skip-tib ; SKIP TIB REFERENCES OR SGML MARKUP |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1781 (re-search-forward ispell-tib-ref-beginning end t) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1782 (setq ref-type 'tib)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1783 (and ispell-skip-sgml |
15312
d425f28aff41
(ispell-region): Handle ispell-skip-sgml properly with an re-search.
Richard M. Stallman <rms@gnu.org>
parents:
15194
diff
changeset
|
1784 (re-search-forward "[<&]" end t) |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1785 (setq ref-type 'sgml))) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1786 (if (or (and (eq 'tib ref-type) ; tib tag is 2 chars. |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1787 (= (- (point) 2) start)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1788 (and (eq 'sgml ref-type) ; sgml skips 1 char. |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1789 (= (- (point) 1) start))) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1790 ;; Skip to end of reference, not necessarily on this line |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1791 ;; Return an error if tib/sgml reference not found |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1792 (if (or |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1793 (and |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1794 (eq 'tib ref-type) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1795 (not |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1796 (re-search-forward ispell-tib-ref-end reg-end t))) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1797 (and (eq 'sgml ref-type) |
15312
d425f28aff41
(ispell-region): Handle ispell-skip-sgml properly with an re-search.
Richard M. Stallman <rms@gnu.org>
parents:
15194
diff
changeset
|
1798 (not (re-search-forward "[>;]" reg-end t)))) |
7606 | 1799 (progn |
1800 (ispell-pdict-save ispell-silently-savep) | |
1801 (ding) | |
1802 (message | |
1803 (concat | |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1804 "Open tib or SGML command. Fix buffer or set " |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1805 (if (eq 'tib ref-type) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1806 "ispell-skip-tib" |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1807 "ispell-skip-sgml") |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1808 " to nil")) |
7606 | 1809 ;; keep cursor at error location |
1810 (setq ispell-quit (- (point) 2)))) | |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1811 ;; Check spelling between reference and start of the line. |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1812 (let ((limit (- (point) (if (eq 'tib ref-type) 2 1)))) |
7606 | 1813 (goto-char start) |
1814 (if (or (re-search-forward ispell-casechars limit t) | |
1815 (re-search-forward "[][()$]" limit t)) | |
1816 (setq string | |
1817 (concat "^" (buffer-substring start limit) | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1818 "\n") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1819 offset-change (- offset-change ispell-offset))) |
7606 | 1820 (goto-char limit)))) |
1821 ((or (re-search-forward ispell-casechars end t) ; TEXT EXISTS | |
1822 (re-search-forward "[][()$]" end t)) ; or MATH COMMANDS | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1823 (setq string (concat "^" (buffer-substring start end) "\n") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1824 offset-change (- offset-change ispell-offset)) |
7606 | 1825 (goto-char end)) |
1826 (t (beginning-of-line 2))) ; EMPTY LINE, skip it. | |
6138 | 1827 |
7606 | 1828 (setq end (point)) ; "end" tracks end of region to check. |
6138 | 1829 |
7606 | 1830 (if string ; there is something to spell! |
1831 (let (poss) | |
1832 ;; send string to spell process and get input. | |
1833 (process-send-string ispell-process string) | |
1834 (while (progn | |
1835 (accept-process-output ispell-process) | |
1836 ;; Last item of output contains a blank line. | |
1837 (not (string= "" (car ispell-filter))))) | |
1838 ;; parse all inputs from the stream one word at a time. | |
1839 ;; Place in FIFO order and remove the blank item. | |
1840 (setq ispell-filter (nreverse (cdr ispell-filter))) | |
1841 (while (and (not ispell-quit) ispell-filter) | |
1842 (setq poss (ispell-parse-output (car ispell-filter))) | |
1843 (if (listp poss) ; spelling error occurred. | |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1844 (let* ((word-start |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1845 (if (and enable-multibyte-characters |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1846 (ispell-get-coding-system)) |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1847 ;; OFFSET returned by ispell |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1848 ;; counts non-ASCII chars as |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1849 ;; one, so just adding OFFSET |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1850 ;; to START will cause an |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1851 ;; error. |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1852 (save-excursion |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1853 (goto-char (+ start offset-change)) |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1854 (forward-char (car (cdr poss))) |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1855 (point)) |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1856 (+ start offset-change |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1857 (car (cdr poss))))) |
7606 | 1858 (word-end (+ word-start |
1859 (length (car poss)))) | |
1860 replace) | |
1861 (goto-char word-start) | |
1862 ;; Adjust the horizontal scroll & point | |
1863 (ispell-horiz-scroll) | |
1864 (goto-char word-end) | |
1865 (ispell-horiz-scroll) | |
1866 (goto-char word-start) | |
1867 (ispell-horiz-scroll) | |
1868 (if (/= word-end | |
1869 (progn | |
1870 (search-forward (car poss) word-end t) | |
1871 (point))) | |
1872 ;; This occurs due to filter pipe problems | |
1873 (error | |
1874 (concat "Ispell misalignment: word " | |
1875 "`%s' point %d; please retry") | |
1876 (car poss) word-start)) | |
11715
4a4401dec2f7
(ispell-region): If position not visible, (sit-for 0).
Richard M. Stallman <rms@gnu.org>
parents:
11562
diff
changeset
|
1877 (if (not (pos-visible-in-window-p)) |
4a4401dec2f7
(ispell-region): If position not visible, (sit-for 0).
Richard M. Stallman <rms@gnu.org>
parents:
11562
diff
changeset
|
1878 (sit-for 0)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1879 (if ispell-keep-choices-win |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1880 (setq replace |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1881 (ispell-command-loop |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1882 (car (cdr (cdr poss))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1883 (car (cdr (cdr (cdr poss)))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1884 (car poss) word-start word-end)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1885 (save-window-excursion |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1886 (setq replace |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1887 (ispell-command-loop |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1888 (car (cdr (cdr poss))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1889 (car (cdr (cdr (cdr poss)))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1890 (car poss) word-start word-end)))) |
7606 | 1891 (cond |
1892 ((and replace (listp replace)) | |
1893 ;; REPLACEMENT WORD entered. Recheck line | |
1894 ;; starting with the replacement word. | |
1895 (setq ispell-filter nil | |
1896 string (buffer-substring word-start | |
1897 word-end)) | |
1898 (let ((change (- (length (car replace)) | |
1899 (length (car poss))))) | |
1900 ;; adjust regions | |
1901 (setq reg-end (+ reg-end change) | |
1902 offset-change (+ offset-change | |
1903 change))) | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1904 (if (not (equal (car replace) (car poss))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1905 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1906 (delete-region word-start word-end) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1907 (insert (car replace)))) |
7606 | 1908 ;; I only need to recheck typed-in replacements |
1909 (if (not (eq 'query-replace | |
1910 (car (cdr replace)))) | |
1911 (backward-char (length (car replace)))) | |
1912 (setq end (point)) ; reposition for recheck | |
1913 ;; when second arg exists, query-replace, saving regions | |
1914 (if (car (cdr replace)) | |
1915 (unwind-protect | |
1916 (save-window-excursion | |
1917 (set-marker | |
1918 ispell-query-replace-marker reg-end) | |
1919 ;; Assume case-replace & | |
1920 ;; case-fold-search correct? | |
1921 (query-replace string (car replace) | |
1922 t)) | |
1923 (setq reg-end | |
1924 (marker-position | |
1925 ispell-query-replace-marker)) | |
1926 (set-marker ispell-query-replace-marker | |
1927 nil)))) | |
1928 ((or (null replace) | |
1929 (equal 0 replace)) ; ACCEPT/INSERT | |
1930 (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD | |
1931 (setq reg-end | |
1932 (ispell-add-per-file-word-list | |
1933 (car poss) reg-end))) | |
1934 ;; This avoids pointing out the word that was | |
1935 ;; just accepted (via 'i' or 'a') if it follows | |
1936 ;; on the same line. | |
1937 ;; Redo check following the accepted word. | |
1938 (if (and ispell-pdict-modified-p | |
1939 (listp ispell-pdict-modified-p)) | |
1940 ;; Word accepted. Recheck line. | |
1941 (setq ispell-pdict-modified-p ; update flag | |
1942 (car ispell-pdict-modified-p) | |
1943 ispell-filter nil ; discontinue check | |
1944 end word-start))) ; reposition loc. | |
1945 (replace ; STRING REPLACEMENT for this word. | |
1946 (delete-region word-start word-end) | |
1947 (insert replace) | |
1948 (let ((change (- (length replace) | |
1949 (length (car poss))))) | |
1950 (setq reg-end (+ reg-end change) | |
1951 offset-change (+ offset-change change) | |
1952 end (+ end change))))) | |
1953 (if (not ispell-quit) | |
17143
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1954 (let (message-log-max) |
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1955 (message "Continuing spelling check using %s dictionary..." |
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1956 (or ispell-dictionary "default")))) |
7606 | 1957 (sit-for 0))) |
1958 ;; finished with line! | |
1959 (setq ispell-filter (cdr ispell-filter))))) | |
1960 (goto-char end))))) | |
1961 (not ispell-quit)) | |
1962 ;; protected | |
1963 (if (get-buffer ispell-choices-buffer) | |
1964 (kill-buffer ispell-choices-buffer)) | |
1965 (if ispell-quit | |
1966 (progn | |
1967 ;; preserve or clear the region for ispell-continue. | |
1968 (if (not (numberp ispell-quit)) | |
1969 (set-marker ispell-region-end nil) | |
1970 ;; Enable ispell-continue. | |
1971 (set-marker ispell-region-end reg-end) | |
1972 (goto-char ispell-quit)) | |
1973 ;; Check for aborting | |
1974 (if (and ispell-checking-message (numberp ispell-quit)) | |
1975 (progn | |
1976 (setq ispell-quit nil) | |
1977 (error "Message send aborted."))) | |
1978 (setq ispell-quit nil)) | |
1979 (set-marker ispell-region-end nil) | |
1980 ;; Only save if successful exit. | |
1981 (ispell-pdict-save ispell-silently-savep) | |
1982 (message "Spell-checking done")))) | |
6138 | 1983 |
1984 | |
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1985 ;;;###autoload |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1986 (defun ispell-comments-and-strings () |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1987 "Check comments and strings in the current buffer for spelling errors." |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1988 (interactive) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1989 (goto-char (point-min)) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1990 (let (state done) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1991 (while (not done) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1992 (setq done t) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1993 (setq state (parse-partial-sexp (point) (point-max) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1994 nil nil state 'syntax-table)) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1995 (when (or (nth 3 state) (nth 4 state)) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1996 (let ((start (point))) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1997 (setq state (parse-partial-sexp start (point-max) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1998 nil nil state 'syntax-table)) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
1999 (when (or (nth 3 state) (nth 4 state)) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2000 (error "Unterminated string or comment.")) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2001 (save-excursion |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2002 (setq done (not (ispell-region start (point)))))))))) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2003 |
6138 | 2004 |
2005 ;;;###autoload | |
7606 | 2006 (defun ispell-buffer () |
6138 | 2007 "Check the current buffer for spelling errors interactively." |
2008 (interactive) | |
2009 (ispell-region (point-min) (point-max))) | |
2010 | |
7606 | 2011 |
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
2012 ;;;###autoload |
6138 | 2013 (defun ispell-continue () |
2014 (interactive) | |
2015 "Continue a spelling session after making some changes." | |
2016 (if (not (marker-position ispell-region-end)) | |
2017 (message "No session to continue. Use 'X' command when checking!") | |
2018 (if (not (equal (marker-buffer ispell-region-end) (current-buffer))) | |
2019 (message "Must continue ispell from buffer %s" | |
2020 (buffer-name (marker-buffer ispell-region-end))) | |
2021 (ispell-region (point) (marker-position ispell-region-end))))) | |
2022 | |
2023 | |
2024 ;;; Horizontal scrolling | |
7606 | 2025 (defun ispell-horiz-scroll () |
2026 "Places point within the horizontal visibility of its window area." | |
6138 | 2027 (if truncate-lines ; display truncating lines? |
2028 ;; See if display needs to be scrolled. | |
2029 (let ((column (- (current-column) (max (window-hscroll) 1)))) | |
2030 (if (and (< column 0) (> (window-hscroll) 0)) | |
2031 (scroll-right (max (- column) 10)) | |
2032 (if (>= column (- (window-width) 2)) | |
2033 (scroll-left (max (- column (window-width) -3) 10))))))) | |
2034 | |
2035 | |
2036 ;;; Interactive word completion. | |
2037 ;;; Forces "previous-word" processing. Do we want to make this selectable? | |
2038 | |
2039 ;;;###autoload | |
2040 (defun ispell-complete-word (&optional interior-frag) | |
2041 "Look up word before or under point in dictionary (see lookup-words command) | |
2042 and try to complete it. If optional INTERIOR-FRAG is non-nil then the word | |
2043 may be a character sequence inside of a word. | |
2044 | |
2045 Standard ispell choices are then available." | |
2046 (interactive "P") | |
2047 (let ((cursor-location (point)) | |
7606 | 2048 case-fold-search |
6138 | 2049 (word (ispell-get-word nil "\\*")) ; force "previous-word" processing. |
2050 start end possibilities replacement) | |
2051 (setq start (car (cdr word)) | |
2052 end (car (cdr (cdr word))) | |
2053 word (car word) | |
2054 possibilities | |
2055 (or (string= word "") ; Will give you every word | |
2056 (lookup-words (concat (if interior-frag "*") word "*") | |
2057 ispell-complete-word-dict))) | |
2058 (cond ((eq possibilities t) | |
2059 (message "No word to complete")) | |
2060 ((null possibilities) | |
2061 (message "No match for \"%s\"" word)) | |
2062 (t ; There is a modification... | |
7606 | 2063 (cond ; Try and respect case of word. |
2064 ((string-match "^[^A-Z]+$" word) | |
2065 (setq possibilities (mapcar 'downcase possibilities))) | |
2066 ((string-match "^[^a-z]+$" word) | |
2067 (setq possibilities (mapcar 'upcase possibilities))) | |
2068 ((string-match "^[A-Z]" word) | |
2069 (setq possibilities (mapcar 'capitalize possibilities)))) | |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2070 (save-window-excursion |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2071 (setq replacement |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2072 (ispell-command-loop possibilities nil word start end))) |
6138 | 2073 (cond |
2074 ((equal 0 replacement) ; BUFFER-LOCAL ADDITION | |
2075 (ispell-add-per-file-word-list word)) | |
2076 (replacement ; REPLACEMENT WORD | |
2077 (delete-region start end) | |
2078 (setq word (if (atom replacement) replacement (car replacement)) | |
2079 cursor-location (+ (- (length word) (- end start)) | |
2080 cursor-location)) | |
2081 (insert word) | |
2082 (if (not (atom replacement)) ; recheck spelling of replacement. | |
2083 (progn | |
2084 (goto-char cursor-location) | |
2085 (ispell-word nil t))))) | |
2086 (if (get-buffer ispell-choices-buffer) | |
2087 (kill-buffer ispell-choices-buffer)))) | |
2088 (ispell-pdict-save ispell-silently-savep) | |
2089 (goto-char cursor-location))) | |
2090 | |
2091 | |
2092 ;;;###autoload | |
2093 (defun ispell-complete-word-interior-frag () | |
7606 | 2094 "Completes word matching character sequence inside a word." |
6138 | 2095 (interactive) |
2096 (ispell-complete-word t)) | |
2097 | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2098 |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2099 ;;; ********************************************************************** |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2100 ;;; Ispell Minor Mode |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2101 ;;; ********************************************************************** |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2102 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2103 (defvar ispell-minor-mode nil |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2104 "Non-nil if Ispell minor mode is enabled.") |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2105 ;; Variable indicating that ispell minor mode is active. |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2106 (make-variable-buffer-local 'ispell-minor-mode) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2107 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2108 (or (assq 'ispell-minor-mode minor-mode-alist) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2109 (setq minor-mode-alist |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2110 (cons '(ispell-minor-mode " Spell") minor-mode-alist))) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2111 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2112 (defvar ispell-minor-keymap |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2113 (let ((map (make-sparse-keymap))) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2114 (define-key map " " 'ispell-minor-check) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2115 (define-key map "\r" 'ispell-minor-check) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2116 map) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2117 "Keymap used for Ispell minor mode.") |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2118 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2119 (or (not (boundp 'minor-mode-map-alist)) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2120 (assoc 'ispell-minor-mode minor-mode-map-alist) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2121 (setq minor-mode-map-alist |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2122 (cons (cons 'ispell-minor-mode ispell-minor-keymap) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2123 minor-mode-map-alist))) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2124 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2125 ;;;###autoload |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2126 (defun ispell-minor-mode (&optional arg) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2127 "Toggle Ispell minor mode. |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2128 With prefix arg, turn Ispell minor mode on iff arg is positive. |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2129 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2130 In Ispell minor mode, pressing SPC or RET |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2131 warns you if the previous word is incorrectly spelled." |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2132 (interactive "P") |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2133 (setq ispell-minor-mode |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2134 (not (or (and (null arg) ispell-minor-mode) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2135 (<= (prefix-numeric-value arg) 0)))) |
11562
8ff50a0715e1
(ispell-minor-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11469
diff
changeset
|
2136 (force-mode-line-update)) |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2137 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2138 (defun ispell-minor-check () |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2139 ;; Check previous word then continue with the normal binding of this key. |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2140 (interactive "*") |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2141 (let ((ispell-minor-mode nil) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2142 (ispell-check-only t)) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2143 (save-restriction |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2144 (narrow-to-region (point-min) (point)) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2145 (ispell-word nil t)) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2146 (call-interactively (key-binding (this-command-keys))))) |
6138 | 2147 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2148 |
6138 | 2149 ;;; ********************************************************************** |
2150 ;;; Ispell Message | |
2151 ;;; ********************************************************************** | |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2152 ;;; Original from D. Quinlan, E. Bradford, A. Albert, and M. Ernst |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2153 |
6138 | 2154 |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2155 (defvar ispell-message-text-end |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2156 (mapconcat (function identity) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2157 '( |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2158 ;; Matches postscript files. |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2159 "^%!PS-Adobe-[123].0" |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2160 ;; Matches uuencoded text |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2161 "^begin [0-9][0-9][0-9] .*\nM.*\nM.*\nM" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2162 ;; Matches shell files (esp. auto-decoding) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2163 "^#! /bin/[ck]?sh" |
8387
7dca276b66d8
(ispell-message-text-end): Improve context diff regexp.
Richard M. Stallman <rms@gnu.org>
parents:
8298
diff
changeset
|
2164 ;; Matches context difference listing |
7dca276b66d8
(ispell-message-text-end): Improve context diff regexp.
Richard M. Stallman <rms@gnu.org>
parents:
8298
diff
changeset
|
2165 "\\(diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*" |
13092
6b853a17f397
(ispell-message-text-end): Match reporter.el bug reports.
Richard M. Stallman <rms@gnu.org>
parents:
12277
diff
changeset
|
2166 ;; Matches reporter.el bug report |
6b853a17f397
(ispell-message-text-end): Match reporter.el bug reports.
Richard M. Stallman <rms@gnu.org>
parents:
12277
diff
changeset
|
2167 "^current state:\n==============\n" |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2168 ;; Matches "----------------- cut here" |
16762
9b9acdb0e3d7
(ispell-message-text-end): Handle `- ' before
Richard M. Stallman <rms@gnu.org>
parents:
16427
diff
changeset
|
2169 ;; and "------- Start of forwarded message", |
9b9acdb0e3d7
(ispell-message-text-end): Handle `- ' before
Richard M. Stallman <rms@gnu.org>
parents:
16427
diff
changeset
|
2170 ;; or either one with "- " in front. |
9b9acdb0e3d7
(ispell-message-text-end): Handle `- ' before
Richard M. Stallman <rms@gnu.org>
parents:
16427
diff
changeset
|
2171 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|\\(Start of \\)?forwarded message\\)") |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2172 "\\|") |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2173 "*End of text which will be checked in ispell-message. |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2174 If it is a string, limit at first occurrence of that regular expression. |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2175 Otherwise, it must be a function which is called to get the limit.") |
6138 | 2176 |
7606 | 2177 |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2178 (defvar ispell-message-start-skip |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2179 (mapconcat (function identity) |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2180 '( |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2181 ;; Matches forwarded messages |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2182 "^---* Forwarded Message" |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2183 ;; Matches PGP Public Key block |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2184 "^---*BEGIN PGP [A-Z ]*--*" |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2185 ) |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2186 "\\|") |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2187 "Spelling is skipped inside these start/end groups by ispell-message. |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2188 Assumed that blocks are not mutually inclusive.") |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2189 |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2190 |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2191 (defvar ispell-message-end-skip |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2192 (mapconcat (function identity) |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2193 '( |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2194 ;; Matches forwarded messages |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2195 "^--- End of Forwarded Message" |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2196 ;; Matches PGP Public Key block |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2197 "^---*END PGP [A-Z ]*--*" |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2198 ) |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2199 "\\|") |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2200 "Spelling is skipped inside these start/end groups by ispell-message. |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2201 Assumed that blocks are not mutually inclusive.") |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2202 |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2203 |
6138 | 2204 ;;;###autoload |
2205 (defun ispell-message () | |
2206 "Check the spelling of a mail message or news post. | |
2207 Don't check spelling of message headers except the Subject field. | |
2208 Don't check included messages. | |
2209 | |
15551
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2210 To abort spell checking of a message region and send the message anyway, |
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2211 use the `x' command. (Any subsequent regions will be checked.) |
7607 | 2212 The `X' command aborts the message send so that you can edit the buffer. |
6138 | 2213 |
2214 To spell-check whenever a message is sent, include the appropriate lines | |
2215 in your .emacs file: | |
15551
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2216 (add-hook 'message-send-hook 'ispell-message) |
6138 | 2217 (add-hook 'mail-send-hook 'ispell-message) |
2218 (add-hook 'mh-before-send-letter-hook 'ispell-message) | |
2219 | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2220 You can bind this to the key C-c i in GNUS or mail by adding to |
7607 | 2221 `news-reply-mode-hook' or `mail-mode-hook' the following lambda expression: |
6138 | 2222 (function (lambda () (local-set-key \"\\C-ci\" 'ispell-message)))" |
2223 (interactive) | |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2224 (save-excursion |
7606 | 2225 (goto-char (point-min)) |
2226 (let* ((internal-messagep (save-excursion | |
2227 (re-search-forward | |
2228 (concat "^" | |
2229 (regexp-quote mail-header-separator) | |
2230 "$") | |
2231 nil t))) | |
6646
d3e3efcd8461
(ispell-message): Fixed infinite loop on shortened msg.
Richard M. Stallman <rms@gnu.org>
parents:
6309
diff
changeset
|
2232 (limit (copy-marker |
7606 | 2233 (cond |
2234 ((not ispell-message-text-end) (point-max)) | |
2235 ((char-or-string-p ispell-message-text-end) | |
2236 (if (re-search-forward ispell-message-text-end nil t) | |
2237 (match-beginning 0) | |
2238 (point-max))) | |
2239 (t (min (point-max) (funcall ispell-message-text-end)))))) | |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2240 (cite-regexp ;Prefix of inserted text |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2241 (cond |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2242 ((featurep 'supercite) ; sc 3.0 |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2243 (concat "\\(" (sc-cite-regexp) "\\)" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2244 (ispell-non-empty-string sc-reference-tag-string))) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2245 ((featurep 'sc) ; sc 2.3 |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2246 (concat "\\(" sc-cite-regexp "\\)" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2247 (ispell-non-empty-string sc-reference-tag-string))) |
15551
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2248 ((equal major-mode 'news-reply-mode) ;GNUS 4 & below |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2249 (concat "In article <" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2250 (if mail-yank-prefix |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2251 (ispell-non-empty-string mail-yank-prefix) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2252 "^ \\|^\t"))) |
15551
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2253 ((equal major-mode 'message-mode) ;GNUS 5 |
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2254 (concat ".*@.* writes:$" "\\|" |
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2255 (if mail-yank-prefix |
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2256 (ispell-non-empty-string mail-yank-prefix) |
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2257 "^ \\|^\t"))) |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2258 ((equal major-mode 'mh-letter-mode) ; mh mail message |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2259 (ispell-non-empty-string mh-ins-buf-prefix)) |
7606 | 2260 ((not internal-messagep) ; Assume n sent us this message. |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2261 (concat "In [a-zA-Z.]+ you write:" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2262 "In <[^,;&+=]+> [^,;&+=]+ writes:" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2263 " *> *")) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2264 ((boundp 'vm-included-text-prefix) ; VM mail message |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2265 (concat "[^,;&+=]+ writes:" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2266 (ispell-non-empty-string vm-included-text-prefix))) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2267 (mail-yank-prefix ; vanilla mail message. |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2268 (ispell-non-empty-string mail-yank-prefix)) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2269 (t "^ \\|^\t"))) |
7606 | 2270 (cite-regexp-start (concat "^[ \t]*$\\|" cite-regexp)) |
2271 (cite-regexp-end (concat "^\\(" cite-regexp "\\)")) | |
2272 (old-case-fold-search case-fold-search) | |
2273 (case-fold-search t) | |
2274 (ispell-checking-message t)) | |
2275 (goto-char (point-min)) | |
6138 | 2276 ;; Skip header fields except Subject: without Re:'s |
2277 ;;(search-forward mail-header-separator nil t) | |
2278 (while (if internal-messagep | |
2279 (< (point) internal-messagep) | |
7606 | 2280 (and (looking-at "[a-zA-Z---]+:\\|\t\\| ") |
6138 | 2281 (not (eobp)))) |
7606 | 2282 (if (looking-at "Subject: *") ; Spell check new subject fields |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2283 (progn |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2284 (goto-char (match-end 0)) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2285 (if (and (not (looking-at ".*Re\\>")) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2286 (not (looking-at "\\["))) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2287 (let ((case-fold-search old-case-fold-search)) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2288 (ispell-region (point) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2289 (progn |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2290 (end-of-line) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2291 (while (looking-at "\n[ \t]") |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2292 (end-of-line 2)) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2293 (point))))))) |
6138 | 2294 (forward-line 1)) |
2295 (setq case-fold-search nil) | |
2296 ;; Skip mail header, particularly for non-english languages. | |
11304
97b1aef779dc
(ispell-message): Make mail-header-separator into regexp.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2297 (if (looking-at (concat (regexp-quote mail-header-separator) "$")) |
6138 | 2298 (forward-line 1)) |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2299 (while (< (point) limit) |
6138 | 2300 ;; Skip across text cited from other messages. |
2301 (while (and (looking-at cite-regexp-start) | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2302 (< (point) limit) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2303 (zerop (forward-line 1)))) |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2304 |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2305 (if (< (point) limit) |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2306 (let* ((start (point)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2307 ;; Check the next batch of lines that *aren't* cited. |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2308 (end-c (and (re-search-forward cite-regexp-end limit 'end) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2309 (match-beginning 0))) |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2310 ;; Skip a block of included text. |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2311 (end-fwd (and (goto-char start) |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2312 (re-search-forward ispell-message-start-skip |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2313 limit 'end) |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2314 (progn (beginning-of-line) |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2315 (point)))) |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2316 (end (or (and end-c end-fwd (min end-c end-fwd)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2317 end-c end-fwd |
14040 | 2318 ;; default to limit of text. |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2319 (marker-position limit)))) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2320 (goto-char start) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2321 (ispell-region start end) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2322 (if (and end-fwd (= end end-fwd)) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2323 (progn |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2324 (goto-char end) |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2325 (re-search-forward ispell-message-end-skip limit 'end)) |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2326 (goto-char end))))) |
7606 | 2327 (set-marker limit nil)))) |
2328 | |
6138 | 2329 |
2330 (defun ispell-non-empty-string (string) | |
2331 (if (or (not string) (string-equal string "")) | |
2332 "\\'\\`" ; An unmatchable string if string is null. | |
2333 (regexp-quote string))) | |
2334 | |
2335 | |
2336 ;;; ********************************************************************** | |
2337 ;;; Buffer Local Functions | |
2338 ;;; ********************************************************************** | |
2339 | |
2340 | |
2341 (defun ispell-accept-buffer-local-defs () | |
7606 | 2342 "Load all buffer-local information, restarting ispell when necessary." |
6138 | 2343 (ispell-buffer-local-dict) ; May kill ispell-process. |
2344 (ispell-buffer-local-words) ; Will initialize ispell-process. | |
2345 (ispell-buffer-local-parsing)) | |
2346 | |
2347 | |
2348 (defun ispell-buffer-local-parsing () | |
7607 | 2349 "Place Ispell into parsing mode for this buffer. |
7606 | 2350 Overrides the default parsing mode. |
2351 Includes latex/nroff modes and extended character mode." | |
6138 | 2352 ;; (ispell-init-process) must already be called. |
2353 (process-send-string ispell-process "!\n") ; Put process in terse mode. | |
2354 ;; We assume all major modes with "tex-mode" in them should use latex parsing | |
2355 (if (or (and (eq ispell-parser 'use-mode-name) | |
2356 (string-match "[Tt][Ee][Xx]-mode" (symbol-name major-mode))) | |
2357 (eq ispell-parser 'tex)) | |
2358 (process-send-string ispell-process "+\n") ; set ispell mode to tex | |
2359 (process-send-string ispell-process "-\n")) ; set mode to normal (nroff) | |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2360 ;; Hard-wire test for SGML & HTML mode. |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2361 (setq ispell-skip-sgml (memq major-mode '(sgml-mode html-mode))) |
6138 | 2362 ;; Set default extended character mode for given buffer, if any. |
2363 (let ((extended-char-mode (ispell-get-extended-character-mode))) | |
2364 (if extended-char-mode | |
2365 (process-send-string ispell-process (concat extended-char-mode "\n")))) | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2366 ;; Set buffer-local parsing mode and extended character mode, if specified. |
6138 | 2367 (save-excursion |
2368 (goto-char (point-min)) | |
2369 ;; Uses last valid definition | |
2370 (while (search-forward ispell-parsing-keyword nil t) | |
2371 (let ((end (save-excursion (end-of-line) (point))) | |
2372 (case-fold-search t) | |
2373 string) | |
2374 (while (re-search-forward " *\\([^ \"]+\\)" end t) | |
2375 ;; space separated definitions. | |
2376 (setq string (buffer-substring (match-beginning 1) (match-end 1))) | |
2377 (cond ((string-match "latex-mode" string) | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2378 (process-send-string ispell-process "+\n~tex\n")) |
6138 | 2379 ((string-match "nroff-mode" string) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2380 (process-send-string ispell-process "-\n~nroff")) |
6138 | 2381 ((string-match "~" string) ; Set extended character mode. |
2382 (process-send-string ispell-process (concat string "\n"))) | |
20089
5da6e31f3b24
(ispell-change-dictionary): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
19828
diff
changeset
|
2383 (t (message "Invalid Ispell Parsing argument!") |
6138 | 2384 (sit-for 2)))))))) |
2385 | |
2386 | |
2387 ;;; Can kill the current ispell process | |
2388 | |
2389 (defun ispell-buffer-local-dict () | |
7606 | 2390 "Initializes local dictionary. |
6138 | 2391 When a dictionary is defined in the buffer (see variable |
7607 | 2392 `ispell-dictionary-keyword'), it will override the local setting |
6138 | 2393 from \\[ispell-change-dictionary]. |
2394 Both should not be used to define a buffer-local dictionary." | |
2395 (save-excursion | |
2396 (goto-char (point-min)) | |
2397 (let (end) | |
2398 ;; Override the local variable definition. | |
2399 ;; Uses last valid definition. | |
2400 (while (search-forward ispell-dictionary-keyword nil t) | |
2401 (setq end (save-excursion (end-of-line) (point))) | |
2402 (if (re-search-forward " *\\([^ \"]+\\)" end t) | |
2403 (setq ispell-local-dictionary | |
20089
5da6e31f3b24
(ispell-change-dictionary): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
19828
diff
changeset
|
2404 (buffer-substring-no-properties (match-beginning 1) |
5da6e31f3b24
(ispell-change-dictionary): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
19828
diff
changeset
|
2405 (match-end 1))))) |
6138 | 2406 (goto-char (point-min)) |
2407 (while (search-forward ispell-pdict-keyword nil t) | |
2408 (setq end (save-excursion (end-of-line) (point))) | |
2409 (if (re-search-forward " *\\([^ \"]+\\)" end t) | |
2410 (setq ispell-local-pdict | |
20089
5da6e31f3b24
(ispell-change-dictionary): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
19828
diff
changeset
|
2411 (buffer-substring-no-properties (match-beginning 1) |
5da6e31f3b24
(ispell-change-dictionary): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
19828
diff
changeset
|
2412 (match-end 1))))))) |
6138 | 2413 ;; Reload if new personal dictionary defined. |
2414 (if (and ispell-local-pdict | |
2415 (not (equal ispell-local-pdict ispell-personal-dictionary))) | |
2416 (progn | |
2417 (ispell-kill-ispell t) | |
2418 (setq ispell-personal-dictionary ispell-local-pdict))) | |
2419 ;; Reload if new dictionary defined. | |
2420 (if (and ispell-local-dictionary | |
2421 (not (equal ispell-local-dictionary ispell-dictionary))) | |
2422 (ispell-change-dictionary ispell-local-dictionary))) | |
2423 | |
2424 | |
2425 (defun ispell-buffer-local-words () | |
7607 | 2426 "Loads the buffer-local dictionary in the current buffer." |
6138 | 2427 (if (and ispell-buffer-local-name |
2428 (not (equal ispell-buffer-local-name (buffer-name)))) | |
2429 (progn | |
2430 (ispell-kill-ispell t) | |
2431 (setq ispell-buffer-local-name nil))) | |
2432 (ispell-init-process) | |
2433 (save-excursion | |
2434 (goto-char (point-min)) | |
2435 (while (search-forward ispell-words-keyword nil t) | |
2436 (or ispell-buffer-local-name | |
2437 (setq ispell-buffer-local-name (buffer-name))) | |
2438 (let ((end (save-excursion (end-of-line) (point))) | |
2439 string) | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2440 ;; buffer-local words separated by a space, and can contain |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2441 ;; any character other than a space. |
8613
7db17ee1ae58
(ispell-buffer-local-words): Don't treat doublequote
Richard M. Stallman <rms@gnu.org>
parents:
8387
diff
changeset
|
2442 (while (re-search-forward " *\\([^ ]+\\)" end t) |
6138 | 2443 (setq string (buffer-substring (match-beginning 1) (match-end 1))) |
7606 | 2444 (process-send-string ispell-process (concat "@" string "\n"))))))) |
6138 | 2445 |
2446 | |
2447 ;;; returns optionally adjusted region-end-point. | |
2448 | |
2449 (defun ispell-add-per-file-word-list (word &optional reg-end) | |
2450 "Adds new word to the per-file word list." | |
2451 (or ispell-buffer-local-name | |
2452 (setq ispell-buffer-local-name (buffer-name))) | |
2453 (if (null reg-end) | |
2454 (setq reg-end 0)) | |
2455 (save-excursion | |
2456 (goto-char (point-min)) | |
7606 | 2457 (let (case-fold-search line-okay search done string) |
6138 | 2458 (while (not done) |
2459 (setq search (search-forward ispell-words-keyword nil 'move) | |
2460 line-okay (< (+ (length word) 1 ; 1 for space after word.. | |
2461 (progn (end-of-line) (current-column))) | |
2462 80)) | |
2463 (if (or (and search line-okay) | |
2464 (null search)) | |
2465 (progn | |
2466 (setq done t) | |
2467 (if (null search) | |
2468 (progn | |
2469 (open-line 1) | |
2470 (setq string (concat comment-start " " | |
2471 ispell-words-keyword)) | |
2472 ;; in case the keyword is in the middle of the file.... | |
2473 (if (> reg-end (point)) | |
2474 (setq reg-end (+ reg-end (length string)))) | |
2475 (insert string) | |
2476 (if (and comment-end (not (equal "" comment-end))) | |
2477 (save-excursion | |
2478 (open-line 1) | |
2479 (forward-line 1) | |
2480 (insert comment-end))))) | |
2481 (if (> reg-end (point)) | |
2482 (setq reg-end (+ 1 reg-end (length word)))) | |
2483 (insert (concat " " word))))))) | |
2484 reg-end) | |
2485 | |
2486 | |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2487 (defconst ispell-version "2.37 -- Tue Jun 13 12:05:28 EDT 1995") |
6138 | 2488 |
2489 (provide 'ispell) | |
2490 | |
2491 | |
2492 ;;; LOCAL VARIABLES AND BUFFER-LOCAL VALUE EXAMPLES. | |
2493 | |
2494 ;;; Local Variable options: | |
2495 ;;; mode: name(-mode) | |
2496 ;;; eval: expression | |
2497 ;;; local-variable: value | |
2498 | |
2499 ;;; The following sets the buffer local dictionary to english! | |
2500 | |
2501 ;;; Local Variables: | |
2502 ;;; mode: emacs-lisp | |
2503 ;;; comment-column: 40 | |
16217
bf9ff58e9518
(ispell-dictionary-alist-1): Add `american' to list.
Richard M. Stallman <rms@gnu.org>
parents:
15551
diff
changeset
|
2504 ;;; ispell-local-dictionary: "american" |
6138 | 2505 ;;; End: |
2506 | |
2507 | |
2508 ;;; MORE EXAMPLES OF ISPELL BUFFER-LOCAL VALUES | |
2509 | |
2510 ;;; The following places this file in nroff parsing and extended char modes. | |
2511 ;;; Local IspellParsing: nroff-mode ~nroff | |
2512 ;;; Change IspellDict to IspellDict: to enable the following line. | |
2513 ;;; Local IspellDict english | |
2514 ;;; Change IspellPersDict to IspellPersDict: to enable the following line. | |
2515 ;;; Local IspellPersDict ~/.ispell_lisp | |
2516 ;;; The following were automatically generated by ispell using the 'A' command: | |
2517 ; LocalWords: ispell ispell-highlight-p ispell-check-comments query-replace | |
2518 ; LocalWords: ispell-query-replace-choices ispell-skip-tib non-nil tib | |
2519 ; LocalWords: regexps ispell-tib-ref-beginning ispell-tib-ref-end | |
2520 | |
2521 ;; ispell.el ends here |