Mercurial > emacs
annotate lisp/textmodes/ispell.el @ 42646:8fd3ab944dc3
*** empty log message ***
author | Thien-Thi Nguyen <ttn@gnuvola.org> |
---|---|
date | Thu, 10 Jan 2002 22:14:26 +0000 |
parents | 0f4506820432 |
children | d91994a23659 |
rev | line source |
---|---|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37545
diff
changeset
|
1 ;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2 |
13337 | 2 |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
3 ;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. |
13337 | 4 |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37545
diff
changeset
|
5 ;; Author: Ken Stevens <k.stevens@ieee.org> |
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37545
diff
changeset
|
6 ;; Maintainer: Ken Stevens <k.stevens@ieee.org> |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
7 ;; Stevens Mod Date: Fri Aug 4 09:41:50 PDT 2000 |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
8 ;; Stevens Revision: 3.4 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
9 ;; Status : Release with 3.1.12+ and 3.2.0+ ispell. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
10 ;; Bug Reports : ispell-el-bugs@itcorp.com |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
11 ;; Web Site : http://kdstevens.com/~stevens/ispell-page.html |
29208 | 12 ;; Keywords: unix wp |
13337 | 13 |
14169 | 14 ;; This file is part of GNU Emacs. |
13337 | 15 |
14169 | 16 ;; GNU Emacs is free software; you can redistribute it and/or modify |
17 ;; it under the terms of the GNU General Public License as published by | |
18 ;; the Free Software Foundation; either version 2, or (at your option) | |
19 ;; any later version. | |
20 | |
21 ;; GNU Emacs is distributed in the hope that it will be useful, | |
22 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
23 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
24 ;; GNU General Public License for more details. | |
25 | |
26 ;; You should have received a copy of the GNU General Public License | |
27 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
28 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
29 ;; Boston, MA 02111-1307, USA. | |
30 | |
31 ;; Note: version numbers and time stamp are not updated | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
32 ;; when this file is edited for release with GNU emacs. |
14169 | 33 |
6138 | 34 ;;; Commentary: |
14169 | 35 |
36 ;; INSTRUCTIONS | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
37 |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
38 ;; This code contains a section of user-settable variables that you |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
39 ;; should inspect prior to installation. Look past the end of the history |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
40 ;; list. Set them up for your locale and the preferences of the majority |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
41 ;; of the users. Otherwise the users may need to set a number of variables |
14169 | 42 ;; themselves. |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
43 ;; You particularly may want to change the default dictionary for your |
14169 | 44 ;; country and language. |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
45 ;; Most dictionary changes should be made in this file so all users can |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
46 ;; enjoy them. Local or modified dictionaries are supported in your .emacs |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
47 ;; file. Modify the variable `ispell-local-dictionary-alist' to include |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
48 ;; these dictionaries, and they will be installed when ispell.el is loaded. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
49 |
14169 | 50 ;; Depending on the mail system you use, you may want to include these: |
51 ;; (add-hook 'news-inews-hook 'ispell-message) | |
52 ;; (add-hook 'mail-send-hook 'ispell-message) | |
53 ;; (add-hook 'mh-before-send-letter-hook 'ispell-message) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
54 |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
55 ;; Ispell has a TeX parser and a nroff parser (the default). |
14169 | 56 ;; The parsing is controlled by the variable ispell-parser. Currently |
57 ;; it is just a "toggle" between TeX and nroff, but if more parsers are | |
58 ;; added it will be updated. See the variable description for more info. | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
59 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
60 |
14169 | 61 ;; TABLE OF CONTENTS |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
62 |
14169 | 63 ;; ispell-word |
64 ;; ispell-region | |
65 ;; ispell-buffer | |
66 ;; ispell-message | |
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
67 ;; ispell-comments-and-strings |
14169 | 68 ;; ispell-continue |
69 ;; ispell-complete-word | |
70 ;; ispell-complete-word-interior-frag | |
71 ;; ispell-change-dictionary | |
72 ;; ispell-kill-ispell | |
73 ;; ispell-pdict-save | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
74 ;; ispell-skip-region-alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
75 |
14169 | 76 ;; Commands in ispell-region: |
77 ;; Character replacement: Replace word with choice. May query-replace. | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
78 ;; ` ': Accept word this time. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
79 ;; `i': Accept word and insert into private dictionary. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
80 ;; `a': Accept word for this session. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
81 ;; `A': Accept word and place in buffer-local dictionary. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
82 ;; `r': Replace word with typed-in value. Rechecked. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
83 ;; `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
84 ;; `?': Show these commands |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
85 ;; `x': Exit spelling buffer. Move cursor to original point. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
86 ;; `X': Exit spelling buffer. Leaves cursor at the current point, and permits |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
87 ;; the check to be completed later. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
88 ;; `q': Quit spelling session (Kills ispell process). |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
89 ;; `l': Look up typed-in replacement in alternate dictionary. Wildcards okay. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
90 ;; `u': Like `i', but the word is lower-cased first. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
91 ;; `m': Place entered value in personal dictionary, then recheck current word. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
92 ;; `C-l': redraws screen |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
93 ;; `C-r': recursive edit |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
94 ;; `C-z': suspend emacs or iconify frame |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
95 |
14169 | 96 ;; Buffer-Local features: |
97 ;; There are a number of buffer-local features that can be used to customize | |
98 ;; ispell for the current buffer. This includes language dictionaries, | |
99 ;; personal dictionaries, parsing, and local word spellings. Each of these | |
100 ;; local customizations are done either through local variables, or by | |
101 ;; including the keyword and argument(s) at the end of the buffer (usually | |
102 ;; prefixed by the comment characters). See the end of this file for | |
103 ;; examples. The local keywords and variables are: | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
104 |
14169 | 105 ;; ispell-dictionary-keyword language-dictionary |
106 ;; uses local variable ispell-local-dictionary | |
107 ;; ispell-pdict-keyword personal-dictionary | |
108 ;; uses local variable ispell-local-pdict | |
109 ;; ispell-parsing-keyword mode-arg extended-char-arg | |
110 ;; ispell-words-keyword any number of local word spellings | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
111 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
112 ;; Region skipping: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
113 ;; Place new regular expression definitions of regions you prefer not to |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
114 ;; spell check in `ispell-skip-region-alist'. Mode-dependent features can |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
115 ;; be added to latex by modifying `ispell-tex-skip-alists'. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
116 ;; `ispell-message' contains some custom skipping code for e-mail messages. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
117 |
14169 | 118 ;; BUGS: |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
119 ;; Need a way to select between different character mappings without separate |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
120 ;; dictionary entries. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
121 ;; Multi-byte characters if not defined by current dictionary may result in the |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
122 ;; evil "misalignment error" in some versions of MULE emacs. |
14169 | 123 ;; On some versions of emacs, growing the minibuffer fails. |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
124 ;; see `ispell-help-in-bufferp'. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
125 ;; Recursive edits (?C-r or ?R) inside a keyboard text replacement check (?r) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
126 ;; can cause misalignment errors. |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
127 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
128 ;; HISTORY |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
129 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
130 ;; Modifications made in latest versions: |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
131 |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
132 ;; Revision 3.4 2000/8/4 09:41:50 kss |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
133 ;; Support new color display functions. |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
134 ;; Fixed misalignment offset bug when replacing a string after a shift made. |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
135 ;; Set to standard Author/Maintainer heading, |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
136 ;; ensure localwords lists are separated from the text by newline. (Dave Love) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
137 ;; Added dictionary definition for Italian (William Deakin) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
138 ;; HTML region skipping greatly improved. (Chuck D. Phillips) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
139 ;; improved menus. Fixed regexp matching http/email addresses. |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
140 ;; one arg always for xemacs sleep-for (gunnar Evermann) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
141 ;; support for synchronous processes (Eli Zaretskii) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
142 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
143 ;; Revision 3.3 1999/11/29 11:38:34 kss |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
144 ;; Only word replacements entered in from the keyboard are rechecked. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
145 ;; This fixes a bug in tex parsing and misalignment. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
146 ;; Exceptions exist for recursive edit and query-replace, with tex error |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
147 ;; condition tested. Recursive editing improved. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
148 ;; XEmacs repair for when `enable-multibyte-characters' defined - Didier Verna. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
149 ;; ispell-help fixed for XEmacs. Choices minibuffer now displayed in XEmacs. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
150 ;; Only list valid dictionaries in Spell menu. Russian dictionary doesn't allow |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
151 ;; run-together words, and uses koi8-r font. Don't skip text in html <TT> |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
152 ;; fonts. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
153 |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
154 ;; Revision 3.2 1999/5/7 14:25:14 kss |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
155 ;; Accept ispell versions 3.X.Y where X>=1 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
156 ;; fine tuned latex region skipping. Fixed bug in ispell-word that did not |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
157 ;; point in right place on words < 2 chars. Simplified ispell-minor-mode. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
158 ;; Fixed bug in TeX parsing when math commands are in the comments. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
159 ;; Removed calls to `when' macro. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
160 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
161 ;; Revision 3.1 1998/12/1 13:21:52 kss |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
162 ;; Improved and fixed customize support. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
163 ;; Improved and fixed comments in variables and messages. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
164 ;; A coding system is now required for all languages. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
165 ;; casechars improved for castellano, castellano8, and norsk dictionaries. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
166 ;; Dictionary norsk7-tex removed. Dictionary polish added. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
167 ;; Dictionaries redefined at load-time to support dictionary changes. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
168 ;; Menu redefined at load time to support dictionary changes. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
169 ;; ispell-check-version added as an alias for `check-ispell-version'. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
170 ;; Spelling suggestions returned in order generated by ispell. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
171 ;; Small bug fixed in matching ispell error messages. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
172 ;; Robustness added to ensure `case-fold-search' doesn't get redefined. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
173 ;; Fixed bug that didn't respect case of word in `ispell-complete-word'. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
174 ;; Multibyte character coding support added for process interactions. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
175 ;; Ensure ispell process has terminated before starting new process. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
176 ;; This can otherwise confuse process filters and hang ispell. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
177 ;; Improved skipping support for SGML. |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
178 ;; Fixed bug using ^M rather than \r in `ispell-minor-check'. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
179 ;; Improved message reference matching in `ispell-message'. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
180 ;; Fixed bug in returning to nroff mode from tex mode. |
6138 | 181 |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
182 |
6138 | 183 ;;; Code: |
184 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
185 ;;; Custom.el macros require recompiling this when they are not present. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
186 ;;; Add in backward compatible custom support. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
187 (eval-when-compile |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
188 (if (not (fboundp 'defcustom)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
189 (defmacro defcustom (symbol value doc &rest args) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
190 "Empty replacement for defcustom when not supplied." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
191 `(defvar ,symbol ,value ,doc)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
192 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
193 (eval-when-compile |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
194 (if (fboundp 'defgroup) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
195 (defgroup ispell nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
196 "User variables for emacs ispell interface." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
197 :group 'applications))) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
198 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
199 (if (not (fboundp 'buffer-substring-no-properties)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
200 (defun buffer-substring-no-properties (start end) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
201 (buffer-substring start end))) |
6138 | 202 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
203 ;;;###autoload |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
204 (defconst xemacsp (string-match "Lucid\\|XEmacs" emacs-version) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
205 "Non nil if using XEmacs.") |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
206 |
30803
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
207 (defconst ispell-graphic-p |
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
208 (if (fboundp 'display-graphic-p) |
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
209 (display-graphic-p) |
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
210 xemacsp) |
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
211 "True if running on a `graphics capable' display.") |
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
212 |
40412
acbdf8dbf6d4
(version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
39186
diff
changeset
|
213 (defalias 'ispell-check-version 'check-ispell-version) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
214 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
215 ;;; ********************************************************************** |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
216 ;;; The following variables should be set according to personal preference |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
217 ;;; and location of binaries: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
218 ;;; ********************************************************************** |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
219 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
220 |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
221 ;;; ******* THIS FILE IS WRITTEN FOR ISPELL VERSION 3.1+ |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
222 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
223 (defcustom ispell-highlight-p 'block |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
224 "*Highlight spelling errors when non-nil. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
225 When set to `block', assumes a block cursor with TTY displays." |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
226 :type '(choice (const block) (const :tag "off" nil) (const :tag "on" t)) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
227 :group 'ispell) |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
228 |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
229 (defcustom ispell-highlight-face 'highlight |
7607 | 230 "*The face used for Ispell highlighting. For Emacses with overlays. |
231 Possible values are `highlight', `modeline', `secondary-selection', | |
232 `region', and `underline'. | |
6138 | 233 This variable can be set by the user to whatever face they desire. |
234 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
|
235 slightly different." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
236 :type 'face |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
237 :group 'ispell) |
6138 | 238 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
239 (defcustom ispell-check-comments t |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
240 "*Spelling of comments checked when non-nil. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
241 When set to `exclusive', ONLY comments are checked. (For code comments). |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
242 Warning! Not checking comments, when a comment start is embedded in strings, |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
243 may produce undesired results." |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
244 :type '(choice (const exclusive) (const :tag "off" nil) (const :tag "on" t)) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
245 :group 'ispell) |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
246 |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
247 (defcustom ispell-query-replace-choices nil |
7606 | 248 "*Corrections made throughout region when non-nil. |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
249 Uses `query-replace' (\\[query-replace]) for corrections." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
250 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
251 :group 'ispell) |
6138 | 252 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
253 (defcustom ispell-skip-tib nil |
7607 | 254 "*Does not spell check `tib' bibliography references when non-nil. |
7606 | 255 Skips any text between strings matching regular expressions |
7607 | 256 `ispell-tib-ref-beginning' and `ispell-tib-ref-end'. |
6138 | 257 |
258 TeX users beware: Any field starting with [. will skip until a .] -- even | |
7607 | 259 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
|
260 a [.5mm] type of number...." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
261 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
262 :group 'ispell) |
6138 | 263 |
264 (defvar ispell-tib-ref-beginning "[[<]\\." | |
265 "Regexp matching the beginning of a Tib reference.") | |
266 | |
267 (defvar ispell-tib-ref-end "\\.[]>]" | |
268 "Regexp matching the end of a Tib reference.") | |
269 | |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
270 (defcustom ispell-keep-choices-win t |
7607 | 271 "*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
|
272 This minimizes redisplay thrashing." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
273 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
274 :group 'ispell) |
6138 | 275 |
32685
afd8474f34ae
(ispell-mode-line-window-height-fudge):
Miles Bader <miles@gnu.org>
parents:
30954
diff
changeset
|
276 (defcustom ispell-choices-win-default-height 2 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
277 "*The default size of the `*Choices*' window, including mode line. |
32685
afd8474f34ae
(ispell-mode-line-window-height-fudge):
Miles Bader <miles@gnu.org>
parents:
30954
diff
changeset
|
278 Must be greater than 1." |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
279 :type 'integer |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
280 :group 'ispell) |
6138 | 281 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
282 (defcustom ispell-program-name "ispell" |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
283 "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
|
284 :type 'string |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
285 :group 'ispell) |
6138 | 286 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
287 (defcustom ispell-alternate-dictionary |
6138 | 288 (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
|
289 ((file-exists-p "/usr/share/dict/web2") "/usr/share/dict/web2") |
6138 | 290 ((file-exists-p "/usr/dict/words") "/usr/dict/words") |
291 ((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
|
292 ((file-exists-p "/usr/share/dict/words") "/usr/share/dict/words") |
38644
f1184d540c06
(ispell-alternate-dictionary): Add /usr/share/lib/dict/words, for Irix.
Eli Zaretskii <eliz@gnu.org>
parents:
38436
diff
changeset
|
293 ((file-exists-p "/usr/share/lib/dict/words") |
f1184d540c06
(ispell-alternate-dictionary): Add /usr/share/lib/dict/words, for Irix.
Eli Zaretskii <eliz@gnu.org>
parents:
38436
diff
changeset
|
294 "/usr/share/lib/dict/words") |
6138 | 295 ((file-exists-p "/sys/dict") "/sys/dict") |
296 (t "/usr/dict/words")) | |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
297 "*Alternate dictionary for spelling help." |
24795
a7afe99e73cf
(ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents:
24737
diff
changeset
|
298 :type '(choice file (const :tag "None" nil)) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
299 :group 'ispell) |
6138 | 300 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
301 (defcustom ispell-complete-word-dict ispell-alternate-dictionary |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
302 "*Dictionary used for word completion." |
24795
a7afe99e73cf
(ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents:
24737
diff
changeset
|
303 :type '(choice file (const :tag "None" nil)) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
304 :group 'ispell) |
6138 | 305 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
306 (defcustom ispell-message-dictionary-alist nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
307 "*List used by `ispell-message' to select a new dictionary. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
308 It consists of pairs (REGEXP . DICTIONARY). If REGEXP is found |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
309 in the message headers, `ispell-local-dictionary' will be set to |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
310 DICTIONARY if `ispell-local-dictionary' is not buffer-local. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
311 E.g. you may use the following value: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
312 '((\"^Newsgroups:[ \\t]*de\\\\.\" . \"deutsch8\") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
313 (\"^To:[^\\n,]+\\\\.de[ \\t\\n,>]\" . \"deutsch8\"))" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
314 :type '(repeat (cons regexp string)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
315 :group 'ispell) |
6138 | 316 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
317 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
318 (defcustom ispell-grep-command "egrep" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
319 "Name of the grep command for search processes." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
320 :type 'string |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
321 :group 'ispell) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
322 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
323 (defcustom ispell-grep-options "-i" |
7607 | 324 "String of options to use when running the program in `ispell-grep-command'. |
6138 | 325 Should probably be \"-i\" or \"-e\". |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
326 Some machines (like the NeXT) don't support \"-i\"" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
327 :type 'string |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
328 :group 'ispell) |
6138 | 329 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
330 (defcustom ispell-look-command |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
331 (cond ((file-exists-p "/bin/look") "/bin/look") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
332 ((file-exists-p "/usr/local/bin/look") "/usr/local/bin/look") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
333 ((file-exists-p "/usr/bin/look") "/usr/bin/look") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
334 (t "look")) |
6138 | 335 "Name of the look command for search processes. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
336 This must be an absolute file name." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
337 :type 'file |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
338 :group 'ispell) |
6138 | 339 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
340 (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
|
341 "*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
|
342 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
|
343 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
344 :group 'ispell) |
6138 | 345 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
346 (defcustom ispell-have-new-look nil |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
347 "*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
|
348 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
349 :group 'ispell) |
6138 | 350 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
351 (defcustom ispell-look-options (if ispell-have-new-look "-dfr" "-df") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
352 "String of command options for `ispell-look-command'." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
353 :type 'string |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
354 :group 'ispell) |
6138 | 355 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
356 (defcustom ispell-use-ptys-p nil |
7607 | 357 "When non-nil, Emacs uses ptys to communicate with Ispell. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
358 When nil, Emacs uses pipes." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
359 :type 'boolean |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
360 :group 'ispell) |
6138 | 361 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
362 (defcustom ispell-following-word nil |
7607 | 363 "*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
|
364 Otherwise `ispell-word' checks the preceding word." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
365 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
366 :group 'ispell) |
6138 | 367 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
368 (defcustom ispell-help-in-bufferp nil |
7607 | 369 "*Non-nil means display interactive keymap help in a buffer. |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
370 The following values are supported: |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
371 nil Expand the minibuffer and display a short help message |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
372 there for a couple of seconds. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
373 t Pop up a new buffer and display a short help message there |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
374 for a couple of seconds. |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
375 electric Pop up a new buffer and display a long help message there. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
376 User can browse and then exit the help mode." |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
377 :type '(choice (const electric) (const :tag "off" nil) (const :tag "on" t)) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
378 :group 'ispell) |
6138 | 379 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
380 (defcustom ispell-quietly nil |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
381 "*Non-nil means suppress messages in `ispell-word'." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
382 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
383 :group 'ispell) |
6138 | 384 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
385 (defcustom ispell-format-word (function upcase) |
7606 | 386 "*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
|
387 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
|
388 :type 'function |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
389 :group 'ispell) |
6138 | 390 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
391 (defcustom ispell-use-framepop-p nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
392 "When non-nil ispell uses framepop to display choices in a dedicated frame. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
393 You can set this variable to dynamically use framepop if you are in a |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
394 window system by evaluating the following on startup to set this variable: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
395 (and window-system (condition-case () (require 'framepop) (error nil)))" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
396 :type 'boolean |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
397 :group 'ispell) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
398 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
399 ;;;###autoload |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
400 (defcustom ispell-personal-dictionary nil |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
401 "*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
|
402 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
|
403 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
|
404 :type '(choice file |
fa6f38bb8ac1
(ispell-personal-dictionary): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19785
diff
changeset
|
405 (const :tag "default" nil)) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
406 :group 'ispell) |
6138 | 407 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
408 (defcustom ispell-silently-savep nil |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
409 "*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
|
410 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
411 :group 'ispell) |
6138 | 412 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
413 ;;; This is the local dictionary to use. When nil the default dictionary will |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
414 ;;; be used. Change set-default call to use a new default dictionary. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
415 (defcustom ispell-local-dictionary nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
416 "If non-nil, the dictionary to be used for Ispell commands. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
417 The value must be a string dictionary name in `ispell-dictionary-alist'. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
418 |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
419 Setting `ispell-local-dictionary' to a value has the same effect as |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
420 calling \\[ispell-change-dictionary] with that value. This variable |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
421 is automatically set when defined in the file with either |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
422 `ispell-dictionary-keyword' or the Local Variable syntax. |
6138 | 423 |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
424 To create a non-standard default dictionary (not from `ispell-dictionary-alist') |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
425 call function `set-default' with the new dictionary name." |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
426 :type '(choice string |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
427 (const :tag "default" nil)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
428 :group 'ispell) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
429 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
430 (make-variable-buffer-local 'ispell-local-dictionary) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
431 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
432 ;; Call this function set up the default dictionary if not English. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
433 ;;(set-default 'ispell-local-dictionary nil) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
434 |
6138 | 435 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
436 (defcustom ispell-extra-args nil |
7607 | 437 "*If non-nil, a list of extra switches to pass to the Ispell program. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
438 For example, (\"-W\" \"3\") to cause it to accept all 1-3 character |
7606 | 439 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
|
440 for language-specific arguments." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
441 :type '(repeat string) |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
442 :group 'ispell) |
7606 | 443 |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
444 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
445 |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
446 (defcustom ispell-skip-html 'use-mode-name |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
447 "*Indicates whether ispell should skip spell checking of SGML markup. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
448 If t, always skip SGML markup; if nil, never skip; if non-t and non-nil, |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
449 guess whether SGML markup should be skipped according to the name of the |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
450 buffer's major mode." |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
451 :type '(choice (const :tag "always" t) (const :tag "never" nil) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
452 (const :tag "use-mode-name" use-mode-name)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
453 :group 'ispell) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
454 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
455 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
456 ;;; Define definitions here only for personal dictionaries. |
24737
4a18ef61578d
(ispell-local-dictionary-alist): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents:
24701
diff
changeset
|
457 ;;;###autoload |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
458 (defcustom ispell-local-dictionary-alist nil |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
459 "*Contains local or customized dictionary definitions. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
460 See `ispell-dictionary-alist'." |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
461 :type '(repeat (list (choice :tag "Dictionary" |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
462 (string :tag "Dictionary name") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
463 (const :tag "default" nil)) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
464 (regexp :tag "Case characters") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
465 (regexp :tag "Non case characters") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
466 (regexp :tag "Other characters") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
467 (boolean :tag "Many other characters") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
468 (repeat :tag "Ispell command line args" |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
469 (string :tag "Arg")) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
470 (choice :tag "Extended character mode" |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
471 (const "~tex") (const "~plaintex") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
472 (const "~nroff") (const "~list") |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
473 (const "~latin1") (const "~latin3") |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
474 (const :tag "default" nil)) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
475 (choice :tag "Character set" |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
476 (const iso-8859-1) |
24942
517194c6cdc6
(ispell-dictionary-alist-6): Change charset for Russian.
Richard M. Stallman <rms@gnu.org>
parents:
24795
diff
changeset
|
477 (const iso-8859-2) |
517194c6cdc6
(ispell-dictionary-alist-6): Change charset for Russian.
Richard M. Stallman <rms@gnu.org>
parents:
24795
diff
changeset
|
478 (const koi8-r)))) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
479 :group 'ispell) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
480 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
481 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
482 ;;; split dictionary so line length is smaller in loaddefs.el |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
483 |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
484 ;;; First part of dictionary, shortened for loaddefs.el |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
485 ;;;###autoload |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
486 (setq |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
487 ispell-dictionary-alist-1 |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
488 '((nil ; default (English.aff) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
489 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
490 ("american" ; Yankee English |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
491 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
492 ("brasileiro" ; Brazilian mode |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
493 "[A-Z\301\311\315\323\332\300\310\314\322\331\303\325\307\334\302\312\324a-z\341\351\355\363\372\340\350\354\362\371\343\365\347\374\342\352\364]" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
494 "[^A-Z\301\311\315\323\332\300\310\314\322\331\303\325\307\334\302\312\324a-z\341\351\355\363\372\340\350\354\362\371\343\365\347\374\342\352\364]" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
495 "[']" nil ("-d" "brasileiro") nil iso-8859-1) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
496 ("british" ; British version |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
497 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B" "-d" "british") nil iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
498 ("castellano" ; Spanish mode |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
499 "[A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
500 "[^A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]" |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
501 "[-]" nil ("-B" "-d" "castellano") "~tex" iso-8859-1) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
502 ("castellano8" ; 8 bit Spanish mode |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
503 "[A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
504 "[^A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]" |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
505 "[-]" nil ("-B" "-d" "castellano") "~latin1" iso-8859-1))) |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
506 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
507 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
508 ;;; Second part of dictionary, shortened for loaddefs.el |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
509 ;;;###autoload |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
510 (setq |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
511 ispell-dictionary-alist-2 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
512 '(("czech" |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
513 "[A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
514 "[^A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
515 "" nil ("-B" "-d" "czech") nil iso-8859-2) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
516 ("dansk" ; Dansk.aff |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
517 "[A-Z\306\330\305a-z\346\370\345]" "[^A-Z\306\330\305a-z\346\370\345]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
518 "[']" nil ("-C") nil iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
519 ("deutsch" ; Deutsch.aff |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
520 "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
521 ("deutsch8" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
522 "[a-zA-Z\304\326\334\344\366\337\374]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
523 "[^a-zA-Z\304\326\334\344\366\337\374]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
524 "[']" t ("-C" "-d" "deutsch") "~latin1" iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
525 ("english" ; make English explicitly selectable |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
526 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1))) |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
527 |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
528 |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
529 ;;; Third part of dictionary, shortened for loaddefs.el |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
530 ;;;###autoload |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
531 (setq |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
532 ispell-dictionary-alist-3 |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
533 '(("esperanto" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
534 "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
535 "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
536 "[-']" t ("-C") "~latin3" iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
537 ("esperanto-tex" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
538 "[A-Za-z^\\]" "[^A-Za-z^\\]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
539 "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
540 ("francais7" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
541 "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
542 ("francais" ; Francais.aff |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
543 "[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]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
544 "[^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]" |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
545 "[-']" t nil "~list" iso-8859-1))) |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
546 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
547 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
548 ;;; Fourth part of dictionary, shortened for loaddefs.el |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
549 ;;;###autoload |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
550 (setq |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
551 ispell-dictionary-alist-4 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
552 '(("francais-tex" ; Francais.aff |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
553 "[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\\]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
554 "[^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\\]" |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
555 "[-'^`\"]" t nil "~tex" iso-8859-1) |
39186
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
556 ("german" ; german.aff |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
557 "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
558 ("german8" |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
559 "[a-zA-Z\304\326\334\344\366\337\374]" |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
560 "[^a-zA-Z\304\326\334\344\366\337\374]" |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
561 "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
562 ("italiano" ; Italian.aff |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
563 "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
564 "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" |
39186
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
565 "[-]" nil ("-B" "-d" "italian") "~tex" iso-8859-1))) |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
566 |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
567 |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
568 ;;; Fifth part of dictionary, shortened for loaddefs.el |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
569 ;;;###autoload |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
570 (setq |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
571 ispell-dictionary-alist-5 |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
572 '(("nederlands" ; Nederlands.aff |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
573 "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
574 "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
575 "[']" t ("-C") nil iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
576 ("nederlands8" ; Dutch8.aff |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
577 "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
578 "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" |
39186
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
579 "[']" t ("-C") nil iso-8859-1) |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
580 ("norsk" ; 8 bit Norwegian mode |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
581 "[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
582 "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
583 "[\"]" nil ("-d" "norsk") "~list" iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
584 ("norsk7-tex" ; 7 bit Norwegian TeX mode |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
585 "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]" |
39186
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
586 "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1))) |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
587 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
588 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
589 ;;; Sixth part of dictionary, shortened for loaddefs.el |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
590 ;;;###autoload |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
591 (setq |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
592 ispell-dictionary-alist-6 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
593 ;; include Russian iso character set too? |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
594 ;; "[']" t ("-d" "russian") "~latin1" iso-8859-1 |
39186
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
595 '(("polish" ; polish mode |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
596 "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
597 "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
598 "" nil ( "-d" "polish") nil iso-8859-2) |
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
599 ("russian" ; Russian.aff (KOI8-R charset) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
600 "[\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
601 "[^\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]" |
25943
894de35cc296
(ispell-dictionary-alist-6): Don't use "-C" option for Russian.
Phillip Rulon <pjr@gnu.org>
parents:
24942
diff
changeset
|
602 "" nil ("-d" "russian") nil koi8-r) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
603 ("svenska" ; Swedish mode |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
604 "[A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
605 "[^A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]" |
30945
97846db00c98
(ispell-dictionary-alist-6): Add `portugues'.
Gerd Moellmann <gerd@gnu.org>
parents:
30929
diff
changeset
|
606 "[']" nil ("-C") "~list" iso-8859-1) |
97846db00c98
(ispell-dictionary-alist-6): Add `portugues'.
Gerd Moellmann <gerd@gnu.org>
parents:
30929
diff
changeset
|
607 ("portugues" |
97846db00c98
(ispell-dictionary-alist-6): Add `portugues'.
Gerd Moellmann <gerd@gnu.org>
parents:
30929
diff
changeset
|
608 "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" |
97846db00c98
(ispell-dictionary-alist-6): Add `portugues'.
Gerd Moellmann <gerd@gnu.org>
parents:
30929
diff
changeset
|
609 "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" |
36815
f4c0144018d1
(ispell-dictionary-alist-6): Add support
Gerd Moellmann <gerd@gnu.org>
parents:
35221
diff
changeset
|
610 "[']" t ("-C" "-d" "portugues") "~latin1" iso-8859-1) |
f4c0144018d1
(ispell-dictionary-alist-6): Add support
Gerd Moellmann <gerd@gnu.org>
parents:
35221
diff
changeset
|
611 ("slovak" |
f4c0144018d1
(ispell-dictionary-alist-6): Add support
Gerd Moellmann <gerd@gnu.org>
parents:
35221
diff
changeset
|
612 "[A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" |
f4c0144018d1
(ispell-dictionary-alist-6): Add support
Gerd Moellmann <gerd@gnu.org>
parents:
35221
diff
changeset
|
613 "[^A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" |
f4c0144018d1
(ispell-dictionary-alist-6): Add support
Gerd Moellmann <gerd@gnu.org>
parents:
35221
diff
changeset
|
614 "" nil ("-B" "-d" "slovak") nil iso-8859-2))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
615 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
616 ;;;###autoload |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
617 (defcustom ispell-dictionary-alist |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
618 (append ispell-local-dictionary-alist ; dictionary customizations |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
619 ispell-dictionary-alist-1 ispell-dictionary-alist-2 |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
620 ispell-dictionary-alist-3 ispell-dictionary-alist-4 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
621 ispell-dictionary-alist-5 ispell-dictionary-alist-6) |
6138 | 622 "An alist of dictionaries and their associated parameters. |
623 | |
624 Each element of this list is also a list: | |
625 | |
7606 | 626 \(DICTIONARY-NAME CASECHARS NOT-CASECHARS OTHERCHARS MANY-OTHERCHARS-P |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
627 ISPELL-ARGS EXTENDED-CHARACTER-MODE CHARACTER-SET\) |
6138 | 628 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
629 DICTIONARY-NAME is a possible string value of variable `ispell-dictionary', |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
630 nil means the default dictionary. |
6138 | 631 |
632 CASECHARS is a regular expression of valid characters that comprise a | |
633 word. | |
634 | |
635 NOT-CASECHARS is the opposite regexp of CASECHARS. | |
636 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
637 OTHERCHARS is a regexp of characters in the NOT-CASECHARS set but which can be |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
638 used to construct words in some special way. If OTHERCHARS characters follow |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
639 and precede characters from CASECHARS, they are parsed as part of a word, |
19183
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
640 otherwise they become word-breaks. As an example in English, assume the |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
641 regular expression \"[']\" for OTHERCHARS. Then \"they're\" and |
19183
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
642 \"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
|
643 \"Stevens'\" does not include the quote character as part of the word. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
644 If you want OTHERCHARS to be empty, use the empty string. |
6138 | 645 Hint: regexp syntax requires the hyphen to be declared first here. |
646 | |
19183
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
647 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
|
648 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
|
649 single word. |
6138 | 650 |
651 ISPELL-ARGS is a list of additional arguments passed to the ispell | |
652 subprocess. | |
653 | |
654 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
|
655 have been configured in an Ispell affix file. (For example, umlauts |
6138 | 656 can be encoded as \\\"a, a\\\", \"a, ...) Defaults are ~tex and ~nroff |
7607 | 657 in English. This has the same effect as the command-line `-T' option. |
658 The buffer Major Mode controls Ispell's parsing in tex or nroff mode, | |
6138 | 659 but the dictionary can control the extended character mode. |
660 Both defaults can be overruled in a buffer-local fashion. See | |
7607 | 661 `ispell-parsing-keyword' for details on this. |
6138 | 662 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
663 CHARACTER-SET used for languages with multibyte characters. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
664 |
6138 | 665 Note that the CASECHARS and OTHERCHARS slots of the alist should |
666 contain the same character set as casechars and otherchars in the | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
667 LANGUAGE.aff file \(e.g., english.aff\)." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
668 :type '(repeat (list (choice :tag "Dictionary" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
669 (string :tag "Dictionary name") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
670 (const :tag "default" nil)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
671 (regexp :tag "Case characters") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
672 (regexp :tag "Non case characters") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
673 (regexp :tag "Other characters") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
674 (boolean :tag "Many other characters") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
675 (repeat :tag "Ispell command line args" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
676 (string :tag "Arg")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
677 (choice :tag "Extended character mode" |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
678 (const "~tex") (const "~plaintex") |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
679 (const "~nroff") (const "~list") |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
680 (const "~latin1") (const "~latin3") |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
681 (const :tag "default" nil)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
682 (choice :tag "Character set" |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
683 (const iso-8859-1) |
26442
797d877746e1
(ispell-dictionary-alist): Fix type by adding koi8-r
Gerd Moellmann <gerd@gnu.org>
parents:
25943
diff
changeset
|
684 (const iso-8859-2) |
797d877746e1
(ispell-dictionary-alist): Fix type by adding koi8-r
Gerd Moellmann <gerd@gnu.org>
parents:
25943
diff
changeset
|
685 (const koi8-r)))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
686 :group 'ispell) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
687 |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
688 ;;; update the dictionaries at load time |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
689 (setq ispell-dictionary-alist |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
690 (append ispell-local-dictionary-alist ; dictionary customizations |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
691 ispell-dictionary-alist-1 ispell-dictionary-alist-2 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
692 ispell-dictionary-alist-3 ispell-dictionary-alist-4 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
693 ispell-dictionary-alist-5 ispell-dictionary-alist-6)) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
694 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
695 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
696 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
697 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
698 ;;; ********************************************************************** |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
699 ;;; The following are used by ispell, and should not be changed. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
700 ;;; ********************************************************************** |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
701 |
6138 | 702 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
703 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
704 ;;; The version must be 3.1 or greater for this version of ispell.el |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
705 ;;; There is an incompatibility between version 3.1.12 and lower versions. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
706 (defconst ispell-required-version '(3 1 12) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
707 "Ispell versions with which this version of ispell.el is known to work.") |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
708 (defvar ispell-offset -1 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
709 "Offset that maps protocol differences between ispell 3.1 versions.") |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
710 |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
711 (defconst ispell-version "ispell.el 3.4 -- Fri Aug 4 09:41:50 PDT 2000") |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
712 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
713 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
714 (defun check-ispell-version (&optional interactivep) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
715 "Ensure that `ispell-program-name' is valid and the correct version. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
716 Returns version number if called interactively. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
717 Otherwise returns the library path if defined." |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
718 ;; This is a little wasteful as we actually launch ispell twice: once |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
719 ;; to make sure it's the right version, and once for real. But people |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
720 ;; get confused by version mismatches *all* the time (and I've got the |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
721 ;; email to prove it) so I think this is worthwhile. And the -v[ersion] |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
722 ;; option is the only way I can think of to do this that works with |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
723 ;; all versions, since versions earlier than 3.0.09 didn't identify |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
724 ;; themselves on startup. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
725 (interactive "p") |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
726 (let ((case-fold-search-val case-fold-search) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
727 ;; avoid bugs when syntax of `.' changes in various default modes |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
728 (default-major-mode 'fundamental-mode) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
729 result status) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
730 (save-excursion |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
731 (set-buffer (get-buffer-create " *ispell-tmp*")) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
732 (erase-buffer) |
34632 | 733 (setq status (call-process |
734 ispell-program-name nil t nil | |
735 ;; aspell doesn't accept the -vv switch. | |
736 (let ((case-fold-search | |
737 (memq system-type '(ms-dos windows-nt))) | |
738 (speller | |
739 (file-name-nondirectory ispell-program-name))) | |
740 ;; Assume anything that isn't `aspell' is Ispell. | |
741 (if (string-match "\\`aspell" speller) "-v" "-vv")))) | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
742 (goto-char (point-min)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
743 (if interactivep |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
744 (progn |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
745 (end-of-line) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
746 (setq result (concat (buffer-substring-no-properties (point-min) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
747 (point)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
748 ", " |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
749 ispell-version)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
750 (message result)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
751 ;; return library path. |
34131
63a3259e1b50
(check-ispell-version): Don't use match-beginning
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33353
diff
changeset
|
752 (if (re-search-forward "LIBDIR = \\\"\\([^ \t\n]*\\)\\\"" nil t) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
753 (setq result (buffer-substring (match-beginning 1) (match-end 1))))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
754 (goto-char (point-min)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
755 (if (not (memq status '(0 nil))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
756 (error "%s exited with %s %s" ispell-program-name |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
757 (if (stringp status) "signal" "code") status)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
758 (setq case-fold-search t |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
759 status (re-search-forward |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
760 (concat "\\<\\(" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
761 (format "%d" (car ispell-required-version)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
762 "\\)\\.\\([0-9]*\\)\\.\\([0-9]*\\)\\>") |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
763 nil t) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
764 case-fold-search case-fold-search-val) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
765 (if (or (not status) ; major version mismatch |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
766 (< (car (read-from-string (buffer-substring-no-properties |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
767 (match-beginning 2) (match-end 2)))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
768 (car (cdr ispell-required-version)))) ; minor version mismatch |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
769 (error "%s version 3 release %d.%d.%d or greater is required" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
770 ispell-program-name (car ispell-required-version) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
771 (car (cdr ispell-required-version)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
772 (car (cdr (cdr ispell-required-version)))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
773 ;; check that it is the correct version. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
774 (if (and (= (car (read-from-string (buffer-substring-no-properties |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
775 (match-beginning 2)(match-end 2)))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
776 (car (cdr ispell-required-version))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
777 (< (car (read-from-string (buffer-substring-no-properties |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
778 (match-beginning 3)(match-end 3)))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
779 (car (cdr (cdr ispell-required-version))))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
780 (setq ispell-offset 0))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
781 (kill-buffer (current-buffer))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
782 result)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
783 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
784 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
785 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
786 ;;; The preparation of the menu bar menu must be autoloaded |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
787 ;;; because otherwise this file gets autoloaded every time Emacs starts |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
788 ;;; so that it can set up the menus and determine keyboard equivalents. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
789 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
790 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
791 ;;;###autoload |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
792 (defvar ispell-menu-map nil "Key map for ispell menu.") |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
793 ;;; redo menu when loading ispell to get dictionary modifications |
23847 | 794 (setq ispell-menu-map nil) |
6138 | 795 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
796 ;;;###autoload |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
797 (defvar ispell-menu-xemacs nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
798 "Spelling menu for XEmacs. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
799 If nil when package is loaded, a standard menu will be set, |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
800 and added as a submenu of the \"Edit\" menu.") |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
801 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
802 ;;; Break out XEmacs menu and split into several calls to avoid having |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
803 ;;; 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
|
804 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
805 ;;; Set up dictionary |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
806 ;;;###autoload |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
807 (defvar ispell-menu-map-needed |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
808 ;; only needed when not version 18 and not XEmacs. |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
809 (and (not ispell-menu-map) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
810 (not xemacsp) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
811 'reload)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
812 |
33353
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
813 (defvar ispell-library-path (if (or (not (fboundp 'byte-compiling-files-p)) |
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
814 (not (byte-compiling-files-p))) |
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
815 (check-ispell-version)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
816 "The directory where ispell dictionaries reside.") |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
817 |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
818 (defvar ispell-process nil |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
819 "The process object for Ispell.") |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
820 |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
821 (defvar ispell-async-processp (and (fboundp 'kill-process) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
822 (fboundp 'process-send-string) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
823 (fboundp 'accept-process-output) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
824 ;;(fboundp 'start-process) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
825 ;;(fboundp 'set-process-filter) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
826 ;;(fboundp 'process-kill-without-query) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
827 ) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
828 "Non-nil means that the OS supports asynchronous processes.") |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
829 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
830 ;;;###autoload |
33349
b8015b527f27
(ispell-library-path): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
32685
diff
changeset
|
831 (if (and ispell-menu-map-needed |
33353
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
832 (or (not (fboundp 'byte-compiling-files-p)) |
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
833 (not (byte-compiling-files-p)))) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
834 (let ((dicts (reverse (cons (cons "default" nil) ispell-dictionary-alist))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
835 ;; `ispell-library-path' intentionally not defined in autoload |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
836 (path (and (boundp 'ispell-library-path) ispell-library-path)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
837 name load-dict) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
838 (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
|
839 ;; 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
|
840 (while dicts |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
841 (setq name (car (car dicts)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
842 load-dict (car (cdr (member "-d" (nth 5 (car dicts))))) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
843 dicts (cdr dicts)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
844 (cond ((not (stringp name)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
845 (define-key ispell-menu-map (vector 'default) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
846 (cons "Select Default Dict" |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
847 (cons "Dictionary for which Ispell was configured" |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
848 (list 'lambda () '(interactive) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
849 (list |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
850 'ispell-change-dictionary "default")))))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
851 ((or (not path) ; load all if library dir not defined |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
852 (file-exists-p (concat path "/" name ".hash")) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
853 (file-exists-p (concat path "/" name ".has")) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
854 (and load-dict |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
855 (or (file-exists-p(concat path "/" load-dict ".hash")) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
856 (file-exists-p(concat path "/" load-dict ".has"))))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
857 (define-key ispell-menu-map (vector (intern name)) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
858 (cons (concat "Select " (capitalize name) " Dict") |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
859 (list 'lambda () '(interactive) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
860 (list 'ispell-change-dictionary name))))))))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
861 |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
862 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
863 ;;; 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
|
864 ;;;###autoload |
33349
b8015b527f27
(ispell-library-path): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
32685
diff
changeset
|
865 (if (and ispell-menu-map-needed |
33353
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
866 (or (not (fboundp 'byte-compiling-files-p)) |
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
867 (not (byte-compiling-files-p)))) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
868 (progn |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
869 (define-key ispell-menu-map [ispell-change-dictionary] |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
870 '(menu-item "Change Dictionary..." ispell-change-dictionary |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
871 :help "Supply explicit path to dictionary")) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
872 (define-key ispell-menu-map [ispell-kill-ispell] |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
873 '(menu-item "Kill Process" ispell-kill-ispell |
30954
1a632863b632
(ispell-menu-map-needed): Put back the boundp
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30945
diff
changeset
|
874 :enable (and (boundp 'ispell-process) ispell-process |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
875 (eq (ispell-process-status) 'run)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
876 :help "Terminate Ispell subprocess")) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
877 (define-key ispell-menu-map [ispell-pdict-save] |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
878 '(menu-item "Save Dictionary" |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
879 (lambda () (interactive) (ispell-pdict-save t t)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
880 :help "Save personal dictionary")) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
881 (define-key ispell-menu-map [ispell-help] |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
882 ;; use (x-popup-menu last-nonmenu-event(list "" ispell-help-list)) ? |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
883 '(menu-item "Help" |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
884 (lambda () (interactive) (describe-function 'ispell-help)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
885 :help "Show standard Ispell keybindings and commands")) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
886 (define-key ispell-menu-map [ispell-complete-word] |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
887 '(menu-item "Complete Word" ispell-complete-word |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
888 :help "Complete word at cursor using dictionary")) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
889 (define-key ispell-menu-map [ispell-complete-word-interior-frag] |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
890 '(menu-item "Complete Word Fragment" ispell-complete-word-interior-frag |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
891 :help "Complete word fragment at cursor")))) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
892 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
893 ;;;###autoload |
33349
b8015b527f27
(ispell-library-path): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
32685
diff
changeset
|
894 (if (and ispell-menu-map-needed |
33353
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
895 (or (not (fboundp 'byte-compiling-files-p)) |
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
896 (not (byte-compiling-files-p)))) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
897 (progn |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
898 (define-key ispell-menu-map [ispell-continue] |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
899 '(menu-item "Continue Spell-Checking" ispell-continue |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
900 :enable (and (boundp 'ispell-region-end) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
901 (marker-position ispell-region-end) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
902 (equal (marker-buffer ispell-region-end) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
903 (current-buffer))) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
904 :help "Continue spell checking last region")) |
8822
33a3f424c8c3
(ispell-menu-map): Order menu items by size: buffer > region > word.
Karl Heuer <kwzh@gnu.org>
parents:
8803
diff
changeset
|
905 (define-key ispell-menu-map [ispell-word] |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
906 '(menu-item "Spell-Check Word" ispell-word |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
907 :help "Spell-check word at cursor")) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
908 (define-key ispell-menu-map [ispell-comments-and-strings] |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
909 '(menu-item "Spell-Check Comments" ispell-comments-and-strings |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
910 :help "Spell-check only comments and strings")))) |
8725
e4e6dc1e1be8
Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents:
8676
diff
changeset
|
911 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
912 ;;;###autoload |
33349
b8015b527f27
(ispell-library-path): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
32685
diff
changeset
|
913 (if (and ispell-menu-map-needed |
33353
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
914 (or (not (fboundp 'byte-compiling-files-p)) |
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
915 (not (byte-compiling-files-p)))) |
8725
e4e6dc1e1be8
Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents:
8676
diff
changeset
|
916 (progn |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
917 (define-key ispell-menu-map [ispell-region] |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
918 '(menu-item "Spell-Check Region" ispell-region |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
919 :enable mark-active |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
920 :help "Spell-check text in marked region")) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
921 (define-key ispell-menu-map [ispell-message] |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
922 '(menu-item "Spell-Check Message" ispell-message |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
923 :help "Skip headers and included message text")) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
924 (define-key ispell-menu-map [ispell-buffer] |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
925 '(menu-item "Spell-Check Buffer" ispell-buffer |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
926 :help "Check spelling of selected buffer")) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
927 ;;(put 'ispell-region 'menu-enable 'mark-active) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
928 (fset 'ispell-menu-map (symbol-value 'ispell-menu-map)))) |
7606 | 929 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
930 ;;; XEmacs versions 19 & 20 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
931 (if (and xemacsp |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
932 (featurep 'menubar) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
933 (null ispell-menu-xemacs) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
934 (not (and (boundp 'infodock-version) infodock-version))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
935 (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
|
936 (current-menubar (or current-menubar default-menubar)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
937 (menu |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
938 '(["Help" (describe-function 'ispell-help) t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
939 ;;["Help" (popup-menu ispell-help-list) t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
940 ["Check Message" ispell-message t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
941 ["Check Buffer" ispell-buffer t] |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
942 ["Check Comments" ispell-comments-and-strings t] |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
943 ["Check Word" ispell-word t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
944 ["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
|
945 ["Continue Check" ispell-continue t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
946 ["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
|
947 ["Complete Word" ispell-complete-word t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
948 ["Kill Process" ispell-kill-ispell t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
949 "-" |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
950 ["Save Personal Dict"(ispell-pdict-save t t) t] |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
951 ["Change Dictionary" ispell-change-dictionary t] |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
952 ["Select Default" (ispell-change-dictionary "default") t])) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
953 name load-dict) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
954 (while dicts |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
955 (setq name (car (car dicts)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
956 load-dict (car (cdr (member "-d" (nth 5 (car dicts))))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
957 dicts (cdr dicts)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
958 ;; Include if the dictionary is in the library, or path not defined. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
959 (if (and (stringp name) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
960 (or (not ispell-library-path) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
961 (file-exists-p (concat ispell-library-path "/" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
962 name ".hash")) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
963 (file-exists-p (concat ispell-library-path "/" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
964 name ".has")) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
965 (and load-dict |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
966 (or (file-exists-p (concat ispell-library-path "/" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
967 load-dict ".hash")) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
968 (file-exists-p (concat ispell-library-path "/" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
969 load-dict ".has")))))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
970 (setq menu (append menu |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
971 (list |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
972 (vector (concat "Select " (capitalize name)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
973 (list 'ispell-change-dictionary name) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
974 t)))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
975 (setq ispell-menu-xemacs menu) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
976 (if current-menubar |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
977 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
978 (delete-menu-item '("Edit" "Spell")) ; in case already defined |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
979 (add-menu '("Edit") "Spell" ispell-menu-xemacs))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
980 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
981 ;;; Allow incrementing characters as integers in XEmacs 20 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
982 (if (and xemacsp |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
983 (fboundp 'int-char)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
984 (fset 'ispell-int-char 'int-char) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
985 ;; Emacs and XEmacs 19 or earlier |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
986 (fset 'ispell-int-char 'identity)) |
6138 | 987 |
988 | |
989 ;;; ********************************************************************** | |
990 | |
991 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
992 ;;; This variable contains the current dictionary being used if the ispell |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
993 ;;; process is running. Otherwise it contains the global default. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
994 (defvar ispell-dictionary nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
995 "The name of the current dictionary, or nil for the default. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
996 When `ispell-local-dictionary' is nil, `ispell-dictionary' is used to select |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
997 the dictionary for new buffers. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
998 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
999 This is passed to the ispell process using the `-d' switch and is |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1000 used as key in `ispell-dictionary-alist' (which see).") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1001 |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1002 (defun ispell-decode-string (str) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1003 "Decodes multibyte character strings. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1004 Protects against bogus binding of `enable-multibyte-characters' in XEmacs." |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1005 (if (and (or xemacsp |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1006 (and (boundp 'enable-multibyte-characters) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1007 enable-multibyte-characters)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1008 (fboundp 'decode-coding-string) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1009 (ispell-get-coding-system)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1010 (decode-coding-string str (ispell-get-coding-system)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1011 str)) |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1012 |
6138 | 1013 (defun ispell-get-casechars () |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1014 (ispell-decode-string |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1015 (nth 1 (assoc ispell-dictionary ispell-dictionary-alist)))) |
6138 | 1016 (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
|
1017 (ispell-decode-string |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1018 (nth 2 (assoc ispell-dictionary ispell-dictionary-alist)))) |
6138 | 1019 (defun ispell-get-otherchars () |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1020 (ispell-decode-string |
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1021 (nth 3 (assoc ispell-dictionary ispell-dictionary-alist)))) |
6138 | 1022 (defun ispell-get-many-otherchars-p () |
1023 (nth 4 (assoc ispell-dictionary ispell-dictionary-alist))) | |
1024 (defun ispell-get-ispell-args () | |
1025 (nth 5 (assoc ispell-dictionary ispell-dictionary-alist))) | |
1026 (defun ispell-get-extended-character-mode () | |
1027 (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
|
1028 (defun ispell-get-coding-system () |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1029 (nth 7 (assoc ispell-dictionary ispell-dictionary-alist))) |
6138 | 1030 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1031 |
6138 | 1032 (defvar ispell-pdict-modified-p nil |
7607 | 1033 "Non-nil means personal dictionary has modifications to be saved.") |
6138 | 1034 |
1035 ;;; 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
|
1036 ;;; When non-nil, the spell session is terminated. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1037 ;;; When numeric, contains cursor location in buffer, and cursor remains there. |
7607 | 1038 (defvar ispell-quit nil) |
6138 | 1039 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1040 (defvar ispell-process-directory nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1041 "The directory where `ispell-process' was started.") |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1042 |
6138 | 1043 (defvar ispell-filter nil |
7607 | 1044 "Output filter from piped calls to Ispell.") |
6138 | 1045 |
1046 (defvar ispell-filter-continue nil | |
7607 | 1047 "Control variable for Ispell filter function.") |
6138 | 1048 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1049 (defvar ispell-output-buffer nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1050 "Buffer used for reading output of a synchronous Ispell subprocess.") |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1051 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1052 (defvar ispell-session-buffer nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1053 "Buffer used for passing input to a synchronous Ispell subprocess.") |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1054 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1055 (defvar ispell-cmd-args nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1056 "Command-line arguments to pass to a synchronous Ispell subprocess.") |
6138 | 1057 |
1058 (defvar ispell-query-replace-marker (make-marker) | |
7607 | 1059 "Marker for `query-replace' processing.") |
6138 | 1060 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1061 (defvar ispell-recursive-edit-marker (make-marker) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1062 "Marker for return point from recursive edit.") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1063 |
6138 | 1064 (defvar ispell-checking-message nil |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1065 "Non-nil when we're checking a mail message.") |
6138 | 1066 |
1067 (defconst ispell-choices-buffer "*Choices*") | |
1068 | |
7607 | 1069 (defvar ispell-overlay nil "Overlay variable for Ispell highlighting.") |
6138 | 1070 |
1071 ;;; *** Buffer Local Definitions *** | |
1072 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1073 (defconst ispell-words-keyword "LocalWords: " |
6138 | 1074 "The keyword for local oddly-spelled words to accept. |
1075 The keyword will be followed by any number of local word spellings. | |
1076 There can be multiple of these keywords in the file.") | |
1077 | |
1078 (defconst ispell-dictionary-keyword "Local IspellDict: " | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1079 "The keyword for a local dictionary to use. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1080 The keyword must be followed by a correct dictionary name in |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1081 `ispell-dictionary-alist'. When multiple occurrences exist, the last keyword |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1082 definition is used.") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1083 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1084 (defconst ispell-pdict-keyword "Local IspellPersDict: " |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1085 "The keyword for defining buffer local dictionaries. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1086 Keyword must be followed by the filename of a personal dictionary. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1087 The last occurring definition in the buffer will be used.") |
6138 | 1088 |
1089 (defconst ispell-parsing-keyword "Local IspellParsing: " | |
7607 | 1090 "The keyword for overriding default Ispell parsing. |
6138 | 1091 The above keyword string should be followed by `latex-mode' or |
1092 `nroff-mode' to put the current buffer into the desired parsing mode. | |
1093 | |
1094 Extended character mode can be changed for this buffer by placing | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1095 a `~' followed by an extended-character mode -- such as `~.tex'. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1096 The last occurring definition in the buffer will be used.") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1097 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1098 ;;;###autoload |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1099 (defvar ispell-skip-region-alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1100 '((ispell-words-keyword forward-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1101 (ispell-dictionary-keyword forward-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1102 (ispell-pdict-keyword forward-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1103 (ispell-parsing-keyword forward-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1104 ("^---*BEGIN PGP [A-Z ]*--*" . "^---*END PGP [A-Z ]*--*") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1105 ("^---* \\(Start of \\)?[Ff]orwarded [Mm]essage" . "^---* End of [Ff]orwarded [Mm]essage") |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1106 ;; Matches e-mail addresses, file names, http addresses, etc. The `-+' |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1107 ;; pattern necessary for performance reasons when `-' part of word syntax. |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1108 ("\\(-+\\|\\(/\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+\\)") |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1109 ;; This is a pretty complex regexp. It can be simplified to the following: |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1110 ;; "\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+" |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1111 ;; but some valid text will be skipped, e.g. "his/her". This could be |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1112 ;; fixed up (at the expense of a moderately more complex regexp) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1113 ;; by not allowing "/" to be the character which triggers the |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1114 ;; identification of the computer name, e.g.: |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1115 ;; "\\(\\w\\|[-_]\\)+[.:@]\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+" |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1116 ) |
22529 | 1117 "Alist expressing beginning and end of regions not to spell check. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1118 The alist key must be a regular expression. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1119 Valid forms include: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1120 (KEY) - just skip the key. |
22529 | 1121 (KEY . REGEXP) - skip to the end of REGEXP. REGEXP may be string or symbol. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1122 (KEY REGEXP) - skip to end of REGEXP. REGEXP must be a string. |
22529 | 1123 (KEY FUNCTION ARGS) - FUNCTION called with ARGS returns end of region.") |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1124 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1125 |
6138 | 1126 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1127 ;;;###autoload |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1128 (defvar ispell-tex-skip-alists |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1129 '((;;("%\\[" . "%\\]") ; AMStex block comment... |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1130 ;; All the standard LaTeX keywords from L. Lamport's guide: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1131 ;; \cite, \hspace, \hspace*, \hyphenation, \include, \includeonly, \input, |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1132 ;; \label, \nocite, \rule (in ispell - rest included here) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1133 ("\\\\addcontentsline" ispell-tex-arg-end 2) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1134 ("\\\\add\\(tocontents\\|vspace\\)" ispell-tex-arg-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1135 ("\\\\\\([aA]lph\\|arabic\\)" ispell-tex-arg-end) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1136 ;;("\\\\author" ispell-tex-arg-end) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1137 ("\\\\bibliographystyle" ispell-tex-arg-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1138 ("\\\\makebox" ispell-tex-arg-end 0) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1139 ("\\\\e?psfig" ispell-tex-arg-end) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1140 ("\\\\document\\(class\\|style\\)" . |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1141 "\\\\begin[ \t\n]*{[ \t\n]*document[ \t\n]*}")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1142 (;; delimited with \begin. In ispell: displaymath, eqnarray, eqnarray*, |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1143 ;; equation, minipage, picture, tabular, tabular* (ispell) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1144 ("\\(figure\\|table\\)\\*?" ispell-tex-arg-end 0) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1145 ("list" ispell-tex-arg-end 2) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1146 ("program" . "\\\\end[ \t\n]*{[ \t\n]*program[ \t\n]*}") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1147 ("verbatim\\*?" . "\\\\end[ \t\n]*{[ \t\n]*verbatim\\*?[ \t\n]*}"))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1148 "*Lists of regions to be skipped in TeX mode. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1149 First list is used raw. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1150 Second list has key placed inside \\begin{}. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1151 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1152 Delete or add any regions you want to be automatically selected |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1153 for skipping in latex mode.") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1154 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1155 |
6138 | 1156 (defvar ispell-local-pdict ispell-personal-dictionary |
7606 | 1157 "A buffer local variable containing the current personal dictionary. |
7607 | 1158 If non-nil, the value must be a string, which is a file name. |
1159 | |
1160 If you specify a personal dictionary for the current buffer which is | |
1161 different from the current personal dictionary, the effect is similar | |
7606 | 1162 to calling \\[ispell-change-dictionary]. This variable is automatically |
7607 | 1163 set when defined in the file with either `ispell-pdict-keyword' or the |
1164 local variable syntax.") | |
6138 | 1165 |
1166 (make-variable-buffer-local 'ispell-local-pdict) | |
1167 | |
1168 (defvar ispell-buffer-local-name nil | |
1169 "Contains the buffer name if local word definitions were used. | |
1170 Ispell is then restarted because the local words could conflict.") | |
1171 | |
1172 (defvar ispell-parser 'use-mode-name | |
1173 "*Indicates whether ispell should parse the current buffer as TeX Code. | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1174 Special value `use-mode-name' tries to guess using the name of `major-mode'. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1175 Default parser is `nroff'. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1176 Currently the only other valid parser is `tex'. |
6138 | 1177 |
1178 You can set this variable in hooks in your init file -- eg: | |
1179 | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1180 (add-hook 'tex-mode-hook (function (lambda () (setq ispell-parser 'tex))))") |
6138 | 1181 |
1182 (defvar ispell-region-end (make-marker) | |
1183 "Marker that allows spelling continuations.") | |
1184 | |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
1185 (defvar ispell-check-only nil |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
1186 "If non-nil, `ispell-word' does not try to correct the word.") |
6138 | 1187 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1188 |
6138 | 1189 ;;; ********************************************************************** |
1190 ;;; ********************************************************************** | |
1191 | |
1192 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1193 |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1194 ;;;###autoload |
21989
d6cca4865f58
(ispell-word): Make M-$ binding using esc-map.
Richard M. Stallman <rms@gnu.org>
parents:
21873
diff
changeset
|
1195 (define-key esc-map "$" 'ispell-word) |
6839 | 1196 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1197 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1198 (defun ispell-accept-output (&optional timeout-secs timeout-msecs) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1199 "Wait for output from ispell process, or TIMEOUT-SECS and TIMEOUT-MSECS. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1200 If asynchronous subprocesses are not supported, call `ispell-filter' and |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1201 pass it the output of the last ispell invocation." |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1202 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1203 (accept-process-output ispell-process timeout-secs timeout-msecs) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1204 (if (null ispell-process) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1205 (error "No Ispell process to read output from!") |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1206 (let ((buf ispell-output-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1207 ispell-output) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1208 (if (not (bufferp buf)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1209 (setq ispell-filter nil) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1210 (save-excursion |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1211 (set-buffer buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1212 (setq ispell-output (buffer-substring-no-properties |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1213 (point-min) (point-max)))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1214 (ispell-filter t ispell-output) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1215 (save-excursion |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1216 (set-buffer buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1217 (erase-buffer))))))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1218 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1219 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1220 (defun ispell-send-string (string) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1221 "Send the string STRING to the Ispell process." |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1222 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1223 (process-send-string ispell-process string) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1224 ;; Asynchronous subprocesses aren't supported on this losing system. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1225 ;; We keep all the directives passed to Ispell during the entire |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1226 ;; session in a buffer, and pass them anew each time we invoke |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1227 ;; Ispell to process another chunk of text. (Yes, I know this is a |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1228 ;; terrible kludge, and it's a bit slow, but it does get the work done.) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1229 (let ((cmd (aref string 0)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1230 ;; The following commands are not passed to Ispell until |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1231 ;; we have a *reall* reason to invoke it. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1232 (cmds-to-defer '(?* ?@ ?~ ?+ ?- ?! ?%)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1233 (default-major-mode 'fundamental-mode) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1234 (session-buf ispell-session-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1235 (output-buf ispell-output-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1236 (ispell-args ispell-cmd-args) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1237 (defdir ispell-process-directory) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1238 prev-pos) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1239 (save-excursion |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1240 (set-buffer session-buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1241 (setq prev-pos (point)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1242 (setq default-directory defdir) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1243 (insert string) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1244 (if (not (memq cmd cmds-to-defer)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1245 (let (coding-system-for-read coding-system-for-write status) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1246 (if (or xemacsp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1247 (and (boundp 'enable-multibyte-characters) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1248 enable-multibyte-characters)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1249 (setq coding-system-for-read (ispell-get-coding-system) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1250 coding-system-for-write (ispell-get-coding-system))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1251 (set-buffer output-buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1252 (erase-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1253 (set-buffer session-buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1254 (setq status |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1255 (apply 'call-process-region (point-min) (point-max) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1256 ispell-program-name nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1257 output-buf nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1258 "-a" "-m" ispell-args)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1259 (set-buffer output-buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1260 (goto-char (point-min)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1261 (save-match-data |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1262 (if (not (looking-at "@(#) ")) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1263 (error "Ispell error: %s" |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1264 (buffer-substring-no-properties |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1265 (point) (progn (end-of-line) (point))))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1266 ;; If STRING is "^Z\n", we just started Ispell and need |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1267 ;; to retain its version ID line in the output buffer. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1268 ;; Otherwise, remove the ID line, as it will confuse |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1269 ;; `ispell-filter'. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1270 (or (string= string "\032\n") |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1271 (progn |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1272 (forward-line) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1273 (delete-region (point-min) (point)))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1274 ;; If STRING begins with ^ or any normal character, we need |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1275 ;; to remove the last line from the session buffer, since it |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1276 ;; was just spell-checked, and we don't want to check it again. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1277 ;; The same goes for the # command, since Ispell already saved |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1278 ;; the personal dictionary. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1279 (set-buffer session-buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1280 (delete-region prev-pos (point)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1281 ;; Ispell run synchronously saves the personal dictionary |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1282 ;; after each successful command. So we can remove any |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1283 ;; lines in the session buffer that insert words into the |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1284 ;; dictionary. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1285 (if (memq status '(0 nil)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1286 (let ((more-lines t)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1287 (goto-char (point-min)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1288 (while more-lines |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1289 (if (looking-at "^\\*") |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1290 (let ((start (point))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1291 (forward-line) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1292 (delete-region start (point))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1293 (setq more-lines (= 0 (forward-line)))))))))))))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1294 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1295 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1296 |
6138 | 1297 ;;;###autoload |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1298 (defun ispell-word (&optional following quietly continue) |
6138 | 1299 "Check spelling of word under or before the cursor. |
7607 | 1300 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
|
1301 in a window allowing you to choose one. |
7607 | 1302 |
7606 | 1303 If optional argument FOLLOWING is non-nil or if `ispell-following-word' |
6138 | 1304 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
|
1305 \(rather than preceding\) is checked when the cursor is not over a word. |
7606 | 1306 When the optional argument QUIETLY is non-nil or `ispell-quietly' is non-nil |
6138 | 1307 when called interactively, non-corrective messages are suppressed. |
1308 | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1309 With a prefix argument (or if CONTINUE is non-nil), |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1310 resume interrupted spell-checking of a buffer or region. |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1311 |
7606 | 1312 Word syntax described by `ispell-dictionary-alist' (which see). |
6138 | 1313 |
1314 This will check or reload the dictionary. Use \\[ispell-change-dictionary] | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1315 or \\[ispell-region] to update the Ispell process. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1316 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1317 return values: |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1318 nil word is correct or spelling is accpeted. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1319 0 word is inserted into buffer-local definitions. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1320 \"word\" word corrected from word list. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1321 \(\"word\" arg\) word is hand entered. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1322 quit spell session exited." |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1323 |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1324 (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
|
1325 (if continue |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1326 (ispell-continue) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1327 (if (interactive-p) |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1328 (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
|
1329 quietly ispell-quietly)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1330 (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
|
1331 (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
|
1332 (word (ispell-get-word following)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1333 start end poss new-word replace) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1334 ;; De-structure return word info list. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1335 (setq start (car (cdr word)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1336 end (car (cdr (cdr word))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1337 word (car word)) |
6138 | 1338 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1339 ;; now check spelling of word if it has 3 or more characters. |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1340 (cond |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1341 ((> (length word) 2) |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1342 (or quietly |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1343 (message "Checking spelling of %s..." |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1344 (funcall ispell-format-word word))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1345 (ispell-send-string "%\n") ; put in verbose mode |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1346 (ispell-send-string (concat "^" word "\n")) |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1347 ;; wait until ispell has processed word |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1348 (while (progn |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1349 (ispell-accept-output) |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1350 (not (string= "" (car ispell-filter))))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1351 ;;(ispell-send-string "!\n") ;back to terse mode. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1352 (setq ispell-filter (cdr ispell-filter)) ; remove extra \n |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1353 (if (and ispell-filter (listp ispell-filter)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1354 (if (> (length ispell-filter) 1) |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37545
diff
changeset
|
1355 (error "Ispell and its process have different character maps") |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1356 (setq poss (ispell-parse-output (car ispell-filter))))) |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1357 (cond ((eq poss t) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1358 (or quietly |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1359 (message "%s is correct" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1360 (funcall ispell-format-word word)))) |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1361 ((stringp poss) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1362 (or quietly |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1363 (message "%s is correct because of root %s" |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1364 (funcall ispell-format-word word) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1365 (funcall ispell-format-word poss)))) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1366 ((null poss) (message "Error in ispell process")) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1367 (ispell-check-only ; called from ispell minor mode. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1368 (beep) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1369 (message "%s is incorrect" (funcall ispell-format-word word))) |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1370 (t ; prompt for correct word. |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1371 (save-window-excursion |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1372 (setq replace (ispell-command-loop |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1373 (car (cdr (cdr poss))) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1374 (car (cdr (cdr (cdr poss)))) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1375 (car poss) start end))) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1376 (cond ((equal 0 replace) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1377 (ispell-add-per-file-word-list (car poss))) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1378 (replace |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1379 (setq new-word (if (atom replace) replace (car replace)) |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1380 cursor-location (+ (- (length word) (- end start)) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1381 cursor-location)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1382 (if (not (equal new-word (car poss))) |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1383 (progn |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1384 (delete-region start end) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1385 (setq start (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1386 (insert new-word) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1387 (setq end (point)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1388 (if (not (atom replace)) ;recheck spelling of replacement |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1389 (progn |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1390 (if (car (cdr replace)) ; query replace requested |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1391 (save-window-excursion |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1392 (query-replace word new-word t))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1393 (goto-char start) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1394 ;; single word could be split into multiple words |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1395 (setq ispell-quit (not (ispell-region start end))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1396 )))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1397 ;; keep if rechecking word and we keep choices win. |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1398 (if (get-buffer ispell-choices-buffer) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1399 (kill-buffer ispell-choices-buffer)))) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1400 (ispell-pdict-save ispell-silently-savep) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1401 ;; NB: Cancels ispell-quit incorrectly if called from ispell-region |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1402 (if ispell-quit (setq ispell-quit nil replace 'quit)))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1403 (goto-char cursor-location) ; return to original location |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1404 replace))) |
6138 | 1405 |
1406 | |
1407 (defun ispell-get-word (following &optional extra-otherchars) | |
1408 "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
|
1409 If optional argument FOLLOWING is non-nil or if `ispell-following-word' |
6138 | 1410 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
|
1411 \(rather than preceding\) is checked when the cursor is not over a word. |
7606 | 1412 Optional second argument contains otherchars that can be included in word |
6138 | 1413 many times. |
1414 | |
7606 | 1415 Word syntax described by `ispell-dictionary-alist' (which see)." |
6138 | 1416 (let* ((ispell-casechars (ispell-get-casechars)) |
1417 (ispell-not-casechars (ispell-get-not-casechars)) | |
1418 (ispell-otherchars (ispell-get-otherchars)) | |
1419 (ispell-many-otherchars-p (ispell-get-many-otherchars-p)) | |
1420 (word-regexp (concat ispell-casechars | |
1421 "+\\(" | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1422 (if (not (string= "" ispell-otherchars)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1423 (concat ispell-otherchars "?")) |
6138 | 1424 (if extra-otherchars |
1425 (concat extra-otherchars "?")) | |
1426 ispell-casechars | |
1427 "+\\)" | |
1428 (if (or ispell-many-otherchars-p | |
1429 extra-otherchars) | |
1430 "*" "?"))) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1431 did-it-once prevpt |
6138 | 1432 start end word) |
1433 ;; find the word | |
1434 (if (not (looking-at ispell-casechars)) | |
1435 (if following | |
1436 (re-search-forward ispell-casechars (point-max) t) | |
1437 (re-search-backward ispell-casechars (point-min) t))) | |
1438 ;; move to front of word | |
1439 (re-search-backward ispell-not-casechars (point-min) 'start) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1440 (while (and (or (and (not (string= "" ispell-otherchars)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1441 (looking-at ispell-otherchars)) |
6138 | 1442 (and extra-otherchars (looking-at extra-otherchars))) |
1443 (not (bobp)) | |
1444 (or (not did-it-once) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1445 ispell-many-otherchars-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1446 (not (eq prevpt (point)))) |
6138 | 1447 (if (and extra-otherchars (looking-at extra-otherchars)) |
1448 (progn | |
1449 (backward-char 1) | |
1450 (if (looking-at ispell-casechars) | |
1451 (re-search-backward ispell-not-casechars (point-min) 'move))) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1452 (setq did-it-once t |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1453 prevpt (point)) |
6138 | 1454 (backward-char 1) |
1455 (if (looking-at ispell-casechars) | |
1456 (re-search-backward ispell-not-casechars (point-min) 'move) | |
1457 (backward-char -1)))) | |
1458 ;; Now mark the word and save to string. | |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1459 (if (not (re-search-forward word-regexp (point-max) t)) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1460 (if ispell-check-only |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1461 ;; return dummy word when just flagging misspellings |
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1462 (list "" (point) (point)) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1463 (error "No word found to check!")) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1464 (setq start (match-beginning 0) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1465 end (point) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1466 word (buffer-substring-no-properties start end)) |
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1467 (list word start end)))) |
6138 | 1468 |
1469 | |
1470 ;;; Global ispell-pdict-modified-p is set by ispell-command-loop and | |
1471 ;;; tracks changes in the dictionary. The global may either be | |
1472 ;;; a value or a list, whose value is the state of whether the | |
1473 ;;; dictionary needs to be saved. | |
1474 | |
37426 | 1475 ;;;###autoload |
6138 | 1476 (defun ispell-pdict-save (&optional no-query force-save) |
1477 "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
|
1478 If so, ask if it needs to be saved." |
6138 | 1479 (interactive (list ispell-silently-savep t)) |
1480 (if (and ispell-pdict-modified-p (listp ispell-pdict-modified-p)) | |
1481 (setq ispell-pdict-modified-p (car ispell-pdict-modified-p))) | |
1482 (if (or ispell-pdict-modified-p force-save) | |
1483 (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
|
1484 (progn |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1485 (ispell-send-string "#\n") ; save dictionary |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
1486 (message "Personal dictionary saved.")))) |
6138 | 1487 ;; unassert variable, even if not saved to avoid questioning. |
1488 (setq ispell-pdict-modified-p nil)) | |
1489 | |
1490 | |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1491 (defun ispell-command-loop (miss guess word start end) |
6138 | 1492 "Display possible corrections from list MISS. |
1493 GUESS lists possibly valid affix construction of WORD. | |
1494 Returns nil to keep word. | |
7606 | 1495 Returns 0 to insert locally into buffer-local dictionary. |
1496 Returns string for new chosen word. | |
1497 Returns list for new replacement word (will be rechecked). | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1498 Query-replace when list length is 2. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1499 Automatic query-replace when second element is `query-replace'. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1500 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
|
1501 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
|
1502 indicates whether the dictionary has been modified when option `a' or `i' is |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1503 used. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1504 Global `ispell-quit' set to start location to continue spell session." |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1505 (let ((count ?0) |
34579
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
1506 (line ispell-choices-win-default-height) |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1507 ;; ensure 4 context lines. |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1508 (max-lines (- (ispell-adjusted-window-height) 4)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1509 (choices miss) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1510 (window-min-height (min window-min-height |
34579
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
1511 ispell-choices-win-default-height)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1512 (command-characters '( ? ?i ?a ?A ?r ?R ?? ?x ?X ?q ?l ?u ?m )) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1513 (dedicated (window-dedicated-p (selected-window))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1514 (skipped 0) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1515 char num result textwin dedicated-win) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1516 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1517 ;; setup the *Choices* buffer with valid data. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1518 (save-excursion |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1519 (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
|
1520 (setq mode-line-format (concat "-- %b -- word: " word)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1521 ;; XEmacs: prevent thick modeline vs increasing height in overlay-window |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1522 ;;(and (fboundp 'set-specifier) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1523 ;; (set-specifier has-modeline-p (cons (current-buffer) nil))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1524 (erase-buffer) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1525 (if guess |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1526 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1527 (insert "Affix rules generate and capitalize " |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1528 "this word as shown below:\n\t") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1529 (while guess |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1530 (if (> (+ 4 (current-column) (length (car guess))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1531 (window-width)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1532 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1533 (insert "\n\t") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1534 (setq line (1+ line)))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1535 (insert (car guess) " ") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1536 (setq guess (cdr guess))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1537 (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
|
1538 " from the derivative root.\n") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1539 (setq line (+ line (if choices 3 2))))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1540 (while (and choices |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1541 (< (if (> (+ 7 (current-column) (length (car choices)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1542 (if (> count ?~) 3 0)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1543 (window-width)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1544 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1545 (insert "\n") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1546 (setq line (1+ line))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1547 line) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1548 max-lines)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1549 ;; 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
|
1550 ;; 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
|
1551 (while (memq count command-characters) ; skip command characters. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1552 (setq count (ispell-int-char (1+ count)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1553 skipped (1+ skipped))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1554 (insert "(" count ") " (car choices) " ") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1555 (setq choices (cdr choices) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1556 count (ispell-int-char (1+ count)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1557 (setq count (ispell-int-char (- count ?0 skipped)))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1558 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1559 ;; ensure word is visible |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1560 (if (not (pos-visible-in-window-p end)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1561 (sit-for 0)) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1562 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1563 ;; allow temporary split of dedicated windows... |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1564 (if dedicated |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1565 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1566 (setq dedicated-win (selected-window)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1567 (set-window-dedicated-p dedicated-win nil))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1568 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1569 ;; Display choices for misspelled word. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1570 (ispell-show-choices line end) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1571 (select-window (setq textwin (next-window))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1572 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1573 ;; highlight word, protecting current buffer status |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1574 (unwind-protect |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1575 (progn |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1576 (and ispell-highlight-p |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1577 (ispell-highlight-spelling-error start end t)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1578 ;; Loop until a valid choice is made. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1579 (while |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1580 (eq |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1581 t |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1582 (setq |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1583 result |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1584 (progn |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1585 (undo-boundary) |
17143
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1586 (let (message-log-max) |
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1587 (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
|
1588 "unchanged, Character to replace word"))) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1589 (let ((inhibit-quit t)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1590 (setq char (if (fboundp 'read-char-exclusive) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1591 (read-char-exclusive) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1592 (read-char)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1593 skipped 0) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1594 (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
|
1595 (setq char ?X |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1596 quit-flag nil))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1597 ;; Adjust num to array offset skipping command characters. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1598 (let ((com-chars command-characters)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1599 (while com-chars |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1600 (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
|
1601 (setq skipped (1+ skipped))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1602 (setq com-chars (cdr com-chars))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1603 (setq num (- char ?0 skipped))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1604 |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1605 (cond |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1606 ((= char ? ) nil) ; accept word this time only |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1607 ((= char ?i) ; accept and insert word into pers dict |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1608 (ispell-send-string (concat "*" word "\n")) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1609 (setq ispell-pdict-modified-p '(t)) ; dictionary modified! |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1610 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1611 ((or (= char ?a) (= char ?A)) ; accept word without insert |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1612 (ispell-send-string (concat "@" word "\n")) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1613 (if (null ispell-pdict-modified-p) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1614 (setq ispell-pdict-modified-p |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1615 (list ispell-pdict-modified-p))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1616 (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
|
1617 ((or (= char ?r) (= char ?R)) ; type in replacement |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1618 (and (eq 'block ispell-highlight-p) ; refresh tty's |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1619 (ispell-highlight-spelling-error start end nil t)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1620 (let ((result |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1621 (if (or (= char ?R) ispell-query-replace-choices) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1622 (list (read-string |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1623 (format "Query-replacement for %s: "word) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1624 word) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1625 t) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1626 (cons (read-string "Replacement for: " word) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1627 nil)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1628 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1629 (ispell-highlight-spelling-error start end nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1630 'block)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1631 result)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1632 ((or (= char ??) (= char help-char) (= char ?\C-h)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1633 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1634 (ispell-highlight-spelling-error start end nil t)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1635 (ispell-help) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1636 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1637 (ispell-highlight-spelling-error start end nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1638 'block)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1639 t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1640 ;; Quit and move point back. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1641 ((= char ?x) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1642 (ispell-pdict-save ispell-silently-savep) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1643 (message "Exited spell-checking") |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1644 (setq ispell-quit t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1645 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1646 ;; Quit and preserve point. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1647 ((= char ?X) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1648 (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
|
1649 (message "%s" |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1650 (substitute-command-keys |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1651 (concat "Spell-checking suspended;" |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1652 " use C-u \\[ispell-word] to resume"))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1653 (setq ispell-quit start) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1654 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1655 ((= char ?q) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1656 (if (y-or-n-p "Really kill Ispell process? ") |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1657 (progn |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1658 (ispell-kill-ispell t) ; terminate process. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1659 (setq ispell-quit (or (not ispell-checking-message) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1660 (point)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1661 ispell-pdict-modified-p nil)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1662 t)) ; continue if they don't quit. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1663 ((= char ?l) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1664 (and (eq 'block ispell-highlight-p) ; refresh tty displays |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1665 (ispell-highlight-spelling-error start end nil t)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1666 (let ((new-word (read-string |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1667 "Lookup string (`*' is wildcard): " |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1668 word))) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1669 (if new-word |
6138 | 1670 (progn |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1671 (save-excursion |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1672 (set-buffer (get-buffer-create |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1673 ispell-choices-buffer)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1674 (erase-buffer) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1675 (setq count ?0 |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1676 skipped 0 |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1677 mode-line-format (concat |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1678 "-- %b -- word: " |
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1679 new-word) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1680 miss (lookup-words new-word) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1681 choices miss |
34579
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
1682 line ispell-choices-win-default-height) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1683 (while (and choices ; adjust choices window. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1684 (< (if (> (+ 7 (current-column) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1685 (length (car choices)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1686 (if (> count ?~) 3 0)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1687 (window-width)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1688 (progn |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1689 (insert "\n") |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1690 (setq line (1+ line))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1691 line) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1692 max-lines)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1693 (while (memq count command-characters) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1694 (setq count (ispell-int-char (1+ count)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1695 skipped (1+ skipped))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1696 (insert "(" count ") " (car choices) " ") |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1697 (setq choices (cdr choices) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1698 count (ispell-int-char (1+ count)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1699 (setq count (ispell-int-char |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1700 (- count ?0 skipped)))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1701 (ispell-show-choices line end) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1702 (select-window (next-window))))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1703 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1704 (ispell-highlight-spelling-error start end nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1705 'block)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1706 t) ; reselect from new choices |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1707 ((= char ?u) ; insert lowercase into dictionary |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1708 (ispell-send-string (concat "*" (downcase word) "\n")) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1709 (setq ispell-pdict-modified-p '(t)) ; dictionary modified! |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1710 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1711 ((= char ?m) ; type in what to insert |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1712 (ispell-send-string |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1713 (concat "*" (read-string "Insert: " word) "\n")) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1714 (setq ispell-pdict-modified-p '(t)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1715 (cons word nil)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1716 ((and (>= num 0) (< num count)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1717 (if ispell-query-replace-choices ; Query replace flag |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1718 (list (nth num miss) 'query-replace) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1719 (nth num miss))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1720 ((= char ?\C-l) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1721 (redraw-display) t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1722 ((= char ?\C-r) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1723 ;; This may have alignment errors if current line is edited |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1724 (if (marker-position ispell-recursive-edit-marker) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1725 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1726 (message "Only one recursive edit session supported") |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1727 (beep) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1728 (sit-for 2)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1729 (set-marker ispell-recursive-edit-marker start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1730 ;;(set-marker ispell-region-end reg-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1731 (and ispell-highlight-p ; unhighlight |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1732 (ispell-highlight-spelling-error start end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1733 (unwind-protect |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1734 (progn |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1735 (message |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1736 "%s" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1737 (substitute-command-keys |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1738 (concat "Exit recursive edit with" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1739 " \\[exit-recursive-edit]"))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1740 (save-window-excursion (save-excursion |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1741 (recursive-edit)))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1742 ;; protected |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1743 (goto-char ispell-recursive-edit-marker) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1744 (if (not (equal (marker-buffer |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1745 ispell-recursive-edit-marker) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1746 (current-buffer))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1747 (progn |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1748 (set-marker ispell-recursive-edit-marker nil) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1749 (error |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1750 "Cannot continue ispell from this buffer."))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1751 (set-marker ispell-recursive-edit-marker nil))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1752 (list word nil)) ; recheck starting at this word. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1753 ((= char ?\C-z) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1754 (funcall (key-binding "\C-z")) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1755 t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1756 (t (ding) t)))))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1757 result) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1758 ;; protected |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1759 (and ispell-highlight-p ; unhighlight |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1760 (save-window-excursion |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1761 (select-window textwin) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1762 (ispell-highlight-spelling-error start end))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1763 (if dedicated |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1764 (set-window-dedicated-p dedicated-win t))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1765 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1766 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1767 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1768 (defun ispell-show-choices (line end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1769 "Shows the choices in another buffer or frame." |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1770 (if (and ispell-use-framepop-p (fboundp 'framepop-display-buffer)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1771 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1772 (framepop-display-buffer (get-buffer ispell-choices-buffer)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1773 (get-buffer-window ispell-choices-buffer t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1774 (select-window (previous-window))) ; *Choices* window |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1775 ;; standard selection by splitting a small buffer out of this window. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1776 (let ((choices-window (get-buffer-window ispell-choices-buffer))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1777 (if choices-window |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1778 (if (= line (ispell-adjusted-window-height choices-window)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1779 (select-window choices-window) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1780 ;; *Choices* window changed size. Adjust the choices window |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1781 ;; without scrolling the spelled window when possible |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1782 (let ((window-line |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1783 (- line (ispell-adjusted-window-height choices-window))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1784 (visible (progn (vertical-motion -1) (point)))) |
34579
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
1785 (if (< line ispell-choices-win-default-height) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1786 (setq window-line (+ window-line |
34579
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
1787 (- ispell-choices-win-default-height |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1788 line)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1789 (move-to-window-line 0) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1790 (vertical-motion window-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1791 (set-window-start (selected-window) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1792 (if (> (point) visible) visible (point))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1793 (goto-char end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1794 (select-window (previous-window)) ; *Choices* window |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1795 (enlarge-window window-line))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1796 ;; Overlay *Choices* window when it isn't showing |
34579
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
1797 (ispell-overlay-window (max line ispell-choices-win-default-height))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1798 (switch-to-buffer ispell-choices-buffer) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1799 (goto-char (point-min))))) |
6138 | 1800 |
1801 | |
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
1802 ;;;###autoload |
6138 | 1803 (defun ispell-help () |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1804 "Display a list of the options available when a misspelling is encountered. |
6138 | 1805 |
1806 Selections are: | |
1807 | |
1808 DIGIT: Replace the word with a digit offered in the *Choices* buffer. | |
7607 | 1809 SPC: Accept word this time. |
1810 `i': Accept word and insert into private dictionary. | |
1811 `a': Accept word for this session. | |
1812 `A': Accept word and place in `buffer-local dictionary'. | |
1813 `r': Replace word with typed-in value. Rechecked. | |
1814 `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. | |
1815 `?': Show these commands. | |
1816 `x': Exit spelling buffer. Move cursor to original point. | |
1817 `X': Exit spelling buffer. Leaves cursor at the current point, and permits | |
6138 | 1818 the aborted check to be completed later. |
7607 | 1819 `q': Quit spelling session (Kills ispell process). |
1820 `l': Look up typed-in replacement in alternate dictionary. Wildcards okay. | |
1821 `u': Like `i', but the word is lower-cased first. | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1822 `m': Place typed-in value in personal dictionary, then recheck current word. |
7607 | 1823 `C-l': redraws screen |
1824 `C-r': recursive edit | |
1825 `C-z': suspend emacs or iconify frame" | |
6138 | 1826 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1827 (if (equal ispell-help-in-bufferp 'electric) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1828 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1829 (require 'ehelp) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1830 (with-electric-help |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1831 (function (lambda () |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1832 ;;This shouldn't be necessary: with-electric-help needs |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1833 ;; an optional argument telling it about the smallest |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1834 ;; acceptable window-height of the help buffer. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1835 (if (< (window-height) 15) |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1836 (enlarge-window |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1837 (- 15 (ispell-adjusted-window-height)))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1838 (princ "Selections are: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1839 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1840 DIGIT: Replace the word with a digit offered in the *Choices* buffer. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1841 SPC: Accept word this time. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1842 `i': Accept word and insert into private dictionary. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1843 `a': Accept word for this session. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1844 `A': Accept word and place in `buffer-local dictionary'. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1845 `r': Replace word with typed-in value. Rechecked. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1846 `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1847 `?': Show these commands. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1848 `x': Exit spelling buffer. Move cursor to original point. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1849 `X': Exit spelling buffer. Leaves cursor at the current point, and permits |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1850 the aborted check to be completed later. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1851 `q': Quit spelling session (Kills ispell process). |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1852 `l': Look up typed-in replacement in alternate dictionary. Wildcards okay. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1853 `u': Like `i', but the word is lower-cased first. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1854 `m': Place typed-in value in personal dictionary, then recheck current word. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1855 `C-l': redraws screen |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1856 `C-r': recursive edit |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1857 `C-z': suspend emacs or iconify frame") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1858 nil ;undocumented requirement of with-electric-help |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1859 )))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1860 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1861 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1862 (let ((help-1 (concat "[r/R]eplace word; [a/A]ccept for this session; " |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1863 "[i]nsert into private dictionary")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1864 (help-2 (concat "[l]ook a word up in alternate dictionary; " |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1865 "e[x/X]it; [q]uit session")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1866 (help-3 (concat "[u]ncapitalized insert into dict. " |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1867 "Type 'x C-h d ispell-help' for more help"))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1868 (save-window-excursion |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1869 (if ispell-help-in-bufferp |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1870 (progn |
34579
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
1871 (ispell-overlay-window 4) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1872 (switch-to-buffer (get-buffer-create "*Ispell Help*")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1873 (insert (concat help-1 "\n" help-2 "\n" help-3)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1874 (sit-for 5) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1875 (kill-buffer "*Ispell Help*")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1876 (select-window (minibuffer-window)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1877 (erase-buffer) |
40412
acbdf8dbf6d4
(version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
39186
diff
changeset
|
1878 (message nil) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1879 ;;(set-minibuffer-window (selected-window)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1880 (enlarge-window 2) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1881 (insert (concat help-1 "\n" help-2 "\n" help-3)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1882 (sit-for 5) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1883 (erase-buffer)))))) |
6138 | 1884 |
1885 | |
1886 (defun lookup-words (word &optional lookup-dict) | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1887 "Look up WORD in optional word-list dictionary LOOKUP-DICT. |
7606 | 1888 A `*' serves as a wild card. If no wild cards, `look' is used if it exists. |
1889 Otherwise the variable `ispell-grep-command' contains the command used to | |
1890 search for the words (usually egrep). | |
1891 | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1892 Optional second argument contains the dictionary to use; the default is |
7606 | 1893 `ispell-alternate-dictionary'." |
6138 | 1894 ;; We don't use the filter for this function, rather the result is written |
1895 ;; into a buffer. Hence there is no need to save the filter values. | |
1896 (if (null lookup-dict) | |
1897 (setq lookup-dict ispell-alternate-dictionary)) | |
1898 | |
1899 (let* ((process-connection-type ispell-use-ptys-p) | |
1900 (wild-p (string-match "\\*" word)) | |
1901 (look-p (and ispell-look-p ; Only use look for an exact match. | |
1902 (or ispell-have-new-look (not wild-p)))) | |
1903 (ispell-grep-buffer (get-buffer-create "*Ispell-Temp*")) ; result buf | |
1904 (prog (if look-p ispell-look-command ispell-grep-command)) | |
1905 (args (if look-p ispell-look-options ispell-grep-options)) | |
1906 status results loc) | |
1907 (unwind-protect | |
1908 (save-window-excursion | |
1909 (message "Starting \"%s\" process..." (file-name-nondirectory prog)) | |
1910 (set-buffer ispell-grep-buffer) | |
1911 (if look-p | |
1912 nil | |
1913 ;; convert * to .* | |
1914 (insert "^" word "$") | |
1915 (while (search-backward "*" nil t) (insert ".")) | |
1916 (setq word (buffer-string)) | |
1917 (erase-buffer)) | |
1918 (setq status (call-process prog nil t nil args word lookup-dict)) | |
1919 ;; grep returns status 1 and no output when word not found, which | |
1920 ;; is a perfectly normal thing. | |
1921 (if (stringp status) | |
1922 (setq results (cons (format "error: %s exited with signal %s" | |
1923 (file-name-nondirectory prog) status) | |
1924 results)) | |
1925 ;; else collect words into `results' in FIFO order | |
1926 (goto-char (point-max)) | |
1927 ;; assure we've ended with \n | |
1928 (or (bobp) (= (preceding-char) ?\n) (insert ?\n)) | |
1929 (while (not (bobp)) | |
1930 (setq loc (point)) | |
1931 (forward-line -1) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1932 (setq results (cons (buffer-substring-no-properties (point) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1933 (1- loc)) |
6138 | 1934 results))))) |
1935 ;; protected | |
1936 (kill-buffer ispell-grep-buffer) | |
1937 (if (and results (string-match ".+: " (car results))) | |
1938 (error "%s error: %s" ispell-grep-command (car results)))) | |
1939 results)) | |
1940 | |
1941 | |
1942 ;;; "ispell-filter" is a list of output lines from the generating function. | |
1943 ;;; Each full line (ending with \n) is a separate item on the list. | |
1944 ;;; "output" can contain multiple lines, part of a line, or both. | |
1945 ;;; "start" and "end" are used to keep bounds on lines when "output" contains | |
1946 ;;; multiple lines. | |
1947 ;;; "ispell-filter-continue" is true when we have received only part of a | |
1948 ;;; line as output from a generating function ("output" did not end with \n) | |
14040 | 1949 ;;; THIS FUNCTION WILL FAIL IF THE PROCESS OUTPUT DOESN'T END WITH \n! |
6138 | 1950 ;;; This is the case when a process dies or fails. The default behavior |
1951 ;;; in this case treats the next input received as fresh input. | |
1952 | |
1953 (defun ispell-filter (process output) | |
1954 "Output filter function for ispell, grep, and look." | |
1955 (let ((start 0) | |
1956 (continue t) | |
1957 end) | |
1958 (while continue | |
1959 (setq end (string-match "\n" output start)) ; get text up to the newline. | |
1960 ;; If we get out of sync and ispell-filter-continue is asserted when we | |
1961 ;; are not continuing, treat the next item as a separate list. When | |
1962 ;; ispell-filter-continue is asserted, ispell-filter *should* always be a | |
1963 ;; list! | |
1964 | |
1965 ;; Continue with same line (item)? | |
1966 (if (and ispell-filter-continue ispell-filter (listp ispell-filter)) | |
1967 ;; Yes. Add it to the prev item | |
1968 (setcar ispell-filter | |
1969 (concat (car ispell-filter) (substring output start end))) | |
1970 ;; No. This is a new line and item. | |
1971 (setq ispell-filter | |
1972 (cons (substring output start end) ispell-filter))) | |
1973 (if (null end) | |
1974 ;; We've completed reading the output, but didn't finish the line. | |
1975 (setq ispell-filter-continue t continue nil) | |
1976 ;; skip over newline, this line complete. | |
1977 (setq ispell-filter-continue nil end (1+ end)) | |
1978 (if (= end (length output)) ; No more lines in output | |
1979 (setq continue nil) ; so we can exit the filter. | |
1980 (setq start end)))))) ; else move start to next line of input | |
1981 | |
1982 | |
1983 ;;; This function destroys the mark location if it is in the word being | |
1984 ;;; highlighted. | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1985 (defun ispell-highlight-spelling-error-generic (start end &optional highlight |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1986 refresh) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1987 "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
|
1988 When the optional third arg HIGHLIGHT is set, the word is highlighted; |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1989 otherwise it is displayed normally. |
22461
8a7cf102704d
(ispell-region): Return non-nil if not aborted.
Richard M. Stallman <rms@gnu.org>
parents:
22046
diff
changeset
|
1990 Uses block cursor to highlight one character. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1991 Optional REFRESH will unhighlighted then highlight, using block cursor |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1992 highlighting when REFRESH is equal to `block'." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1993 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1994 (or (eq 'block refresh) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1995 (setq start (1+ start)))) ; On block non-refresh, inc start. |
6138 | 1996 (let ((modified (buffer-modified-p)) ; don't allow this fn to modify buffer |
1997 (buffer-read-only nil) ; Allow highlighting read-only buffers. | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1998 (text (buffer-substring-no-properties start end)) ; Save hilight region |
6138 | 1999 (inhibit-quit t) ; inhibit interrupt processing here. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2000 (buffer-undo-list t)) ; don't clutter the undo list. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2001 (goto-char end) |
6138 | 2002 (delete-region start end) |
14040 | 2003 (insert-char ? (- end start)) ; minimize amount of redisplay |
6138 | 2004 (sit-for 0) ; update display |
2005 (if highlight (setq inverse-video (not inverse-video))) ; toggle video | |
2006 (delete-region start end) ; delete whitespace | |
2007 (insert text) ; insert text in inverse video. | |
2008 (sit-for 0) ; update display showing inverse video. | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2009 (if (not highlight) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2010 (goto-char end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2011 (setq inverse-video (not inverse-video)) ; toggle video |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2012 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2013 (goto-char (1- start)))) ; use block cursor to "highlight" char |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2014 (set-buffer-modified-p modified) ; don't modify if flag not set. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2015 (and refresh ; re-highlight |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2016 (ispell-highlight-spelling-error-generic |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2017 (if (eq 'block refresh) start (- start 2)) end t)))) |
6138 | 2018 |
2019 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2020 (defun ispell-highlight-spelling-error-xemacs (start end &optional highlight) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2021 "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
|
2022 When the optional third arg HIGHLIGHT is set, the word is highlighted, |
6138 | 2023 otherwise it is displayed normally." |
2024 (if highlight | |
2025 (isearch-highlight start end) | |
2026 (isearch-dehighlight t)) | |
2027 ;;(sit-for 0) | |
2028 ) | |
2029 | |
2030 | |
7606 | 2031 (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
|
2032 "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
|
2033 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
|
2034 otherwise it is displayed normally. |
7606 | 2035 |
7607 | 2036 The variable `ispell-highlight-face' selects the face to use for highlighting." |
6138 | 2037 (if highlight |
2038 (progn | |
2039 (setq ispell-overlay (make-overlay start end)) | |
2040 (overlay-put ispell-overlay 'face ispell-highlight-face)) | |
2041 (delete-overlay ispell-overlay))) | |
2042 | |
2043 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2044 (defun ispell-highlight-spelling-error (start end &optional highlight refresh) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2045 (cond |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2046 (xemacsp |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2047 (ispell-highlight-spelling-error-xemacs start end highlight)) |
40412
acbdf8dbf6d4
(version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
39186
diff
changeset
|
2048 ((and (featurep 'faces) |
30546
26e5d26a83ed
(ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents:
29208
diff
changeset
|
2049 (or (and (fboundp 'display-color-p) (display-color-p)) |
26e5d26a83ed
(ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents:
29208
diff
changeset
|
2050 window-system)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2051 (ispell-highlight-spelling-error-overlay start end highlight)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2052 (t (ispell-highlight-spelling-error-generic start end highlight refresh)))) |
6138 | 2053 |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2054 (defun ispell-adjusted-window-height (&optional window) |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2055 "Like `window-height', adjusted to correct for the effect of tall mode-lines. |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2056 The value returned is actually the nominal number of text-lines in the |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2057 window plus 1. On a terminal, this is the same value returned by |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2058 `window-height', but if the window has a mode-line is taller than a normal |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2059 text line, the returned value may be smaller than that from |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2060 `window-height'." |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2061 (cond ((fboundp 'window-text-height) |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2062 (1+ (window-text-height window))) |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2063 (ispell-graphic-p |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2064 (1- (window-height window))) |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2065 (t |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2066 (window-height window)))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2067 |
6138 | 2068 (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
|
2069 "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
|
2070 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
|
2071 scrolling the current window. Leave the new window selected." |
6138 | 2072 (save-excursion |
34579
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
2073 (let ((oldot (save-excursion (vertical-motion -1) (point))) |
6138 | 2074 (top (save-excursion (move-to-window-line height) (point)))) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2075 ;; If line above old point (line starting at oldot) would be |
6138 | 2076 ;; hidden by new window, scroll it to just below new win |
2077 ;; otherwise set top line of other win so it doesn't scroll. | |
2078 (if (< oldot top) (setq top oldot)) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2079 ;; if frame is unsplitable, temporarily disable that... |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2080 (if (cdr (assq 'unsplittable (frame-parameters (selected-frame)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2081 (let ((frame (selected-frame))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2082 (modify-frame-parameters frame '((unsplittable . nil))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2083 (split-window nil height) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2084 (modify-frame-parameters frame '((unsplittable . t)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2085 (split-window nil height)) |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2086 (let ((deficit (- height (ispell-adjusted-window-height)))) |
34579
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
2087 (when (> deficit 0) |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2088 ;; Number of lines the window is still too short. We ensure that |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2089 ;; there are at least (1- HEIGHT) lines visible in the window. |
34579
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
2090 (enlarge-window deficit) |
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
2091 (goto-char top) |
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
2092 (vertical-motion deficit) |
432f2f4182cd
(ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents:
34364
diff
changeset
|
2093 (setq top (min (point) oldot)))) |
6138 | 2094 (set-window-start (next-window) top)))) |
2095 | |
2096 | |
2097 ;;; Should we add a compound word match return value? | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2098 (defun ispell-parse-output (output &optional accept-list shift) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2099 "Parse the OUTPUT string from Ispell process and return: |
7607 | 2100 1: t for an exact match. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2101 2: A string containing the root word matched via suffix removal. |
6138 | 2102 3: A list of possible correct spellings of the format: |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2103 (\"ORIGINAL-WORD\" OFFSET MISS-LIST GUESS-LIST) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2104 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
|
2105 OFFSET is an integer giving the line offset of the word. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2106 MISS-LIST and GUESS-LIST are possibly null lists of guesses and misses. |
42206 | 2107 4: nil when an error has occurred. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2108 |
37007
4caced3e865e
(ispell-parse-output): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
36815
diff
changeset
|
2109 Optional second arg ACCEPT-LIST is list of words already accepted. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2110 Optional third arg SHIFT is an offset to apply based on previous corrections." |
6138 | 2111 (cond |
2112 ((string= output "") t) ; for startup with pipes... | |
2113 ((string= output "*") t) ; exact match | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2114 ((string= output "-") t) ; compound word match |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2115 ((string= (substring output 0 1) "+") ; found because of root word |
6138 | 2116 (substring output 2)) ; return root word |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2117 ((equal 0 (string-match "[\ra-zA-Z]" output)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2118 (ding) ; error message from ispell! |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2119 (message (concat "Ispell error: " output)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2120 (sit-for 5) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2121 nil) |
6138 | 2122 (t ; need to process &, ?, and #'s |
2123 (let ((type (substring output 0 1)) ; &, ?, or # | |
2124 (original-word (substring output 2 (string-match " " output 2))) | |
2125 (cur-count 0) ; contains number of misses + guesses | |
2126 count miss-list guess-list offset) | |
2127 (setq output (substring output (match-end 0))) ; skip over misspelling | |
2128 (if (string= type "#") | |
2129 (setq count 0) ; no misses for type # | |
2130 (setq count (string-to-int output) ; get number of misses. | |
2131 output (substring output (1+ (string-match " " output 1))))) | |
2132 (setq offset (string-to-int output)) | |
2133 (if (string= type "#") ; No miss or guess list. | |
2134 (setq output nil) | |
2135 (setq output (substring output (1+ (string-match " " output 1))))) | |
2136 (while output | |
2137 (let ((end (string-match ", \\|\\($\\)" output))) ; end of miss/guess. | |
2138 (setq cur-count (1+ cur-count)) | |
2139 (if (> cur-count count) | |
2140 (setq guess-list (cons (substring output 0 end) guess-list)) | |
2141 (setq miss-list (cons (substring output 0 end) miss-list))) | |
2142 (if (match-end 1) ; True only when at end of line. | |
2143 (setq output nil) ; no more misses or guesses | |
2144 (setq output (substring output (+ end 2)))))) | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2145 ;; return results. Accept word if it was already accepted. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2146 ;; adjust offset. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2147 (if (member original-word accept-list) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2148 t |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2149 (list original-word |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2150 (if (numberp shift) (+ shift offset) offset) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2151 (nreverse miss-list) (nreverse guess-list))))))) |
6138 | 2152 |
2153 | |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2154 (defun ispell-process-status () |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2155 "Return the status of the Ispell process. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2156 When asynchronous processes are not supported, `run' is always returned." |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2157 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2158 (process-status ispell-process) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2159 (and ispell-process 'run))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2160 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2161 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2162 (defun ispell-start-process () |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2163 "Start the ispell process, with support for no asynchronous processes. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2164 Keeps argument list for future ispell invocations for no async support." |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2165 (let (args) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2166 ;; Local dictionary becomes the global dictionary in use. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2167 (if ispell-local-dictionary |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2168 (setq ispell-dictionary ispell-local-dictionary)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2169 (setq args (ispell-get-ispell-args)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2170 (if ispell-dictionary ; use specified dictionary |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2171 (setq args |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2172 (append (list "-d" ispell-dictionary) args))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2173 (if ispell-personal-dictionary ; use specified pers dict |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2174 (setq args |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2175 (append args |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2176 (list "-p" |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2177 (expand-file-name ispell-personal-dictionary))))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2178 (setq args (append args ispell-extra-args)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2179 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2180 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2181 (let ((process-connection-type ispell-use-ptys-p)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2182 (apply 'start-process |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2183 "ispell" nil ispell-program-name |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2184 "-a" ; accept single input lines |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2185 "-m" ; make root/affix combos not in dict |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2186 args)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2187 (setq ispell-cmd-args args |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2188 ispell-output-buffer (generate-new-buffer " *ispell-output*") |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2189 ispell-session-buffer (generate-new-buffer " *ispell-session*")) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2190 (ispell-send-string "\032\n") ; so Ispell prints version and exits |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2191 t))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2192 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2193 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2194 |
6138 | 2195 (defun ispell-init-process () |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2196 "Check status of Ispell process and start if necessary." |
6138 | 2197 (if (and ispell-process |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2198 (eq (ispell-process-status) 'run) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2199 ;; If we're using a personal dictionary, ensure |
6138 | 2200 ;; we're in the same default directory! |
2201 (or (not ispell-personal-dictionary) | |
2202 (equal ispell-process-directory default-directory))) | |
2203 (setq ispell-filter nil ispell-filter-continue nil) | |
2204 ;; may need to restart to select new personal dictionary. | |
2205 (ispell-kill-ispell t) | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2206 (message "Starting new Ispell process...") |
6138 | 2207 (sit-for 0) |
2208 (check-ispell-version) | |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2209 (setq ispell-process-directory default-directory |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2210 ispell-process (ispell-start-process) |
6138 | 2211 ispell-filter nil |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2212 ispell-filter-continue nil) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2213 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2214 (set-process-filter ispell-process 'ispell-filter)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2215 ;; protect against bogus binding of `enable-multibyte-characters' in XEmacs |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2216 (if (and (or xemacsp |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2217 (and (boundp 'enable-multibyte-characters) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2218 enable-multibyte-characters)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2219 (fboundp 'set-process-coding-system)) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2220 (set-process-coding-system ispell-process (ispell-get-coding-system) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2221 (ispell-get-coding-system))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2222 ;; Get version ID line |
40412
acbdf8dbf6d4
(version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
39186
diff
changeset
|
2223 (ispell-accept-output 3) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2224 ;; get more output if filter empty? |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2225 (if (null ispell-filter) (ispell-accept-output 3)) |
6138 | 2226 (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
|
2227 (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
|
2228 ((and |
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
2229 (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
|
2230 (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
|
2231 (progn |
40412
acbdf8dbf6d4
(version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
39186
diff
changeset
|
2232 (ispell-accept-output 3) ; was warn msg. |
11469
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
2233 (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
|
2234 (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
|
2235 (string-match "^@(#) " (car ispell-filter))) |
6138 | 2236 ;; got the version line as expected (we already know it's the right |
2237 ;; version, so don't bother checking again.) | |
2238 nil) | |
2239 (t | |
2240 ;; Otherwise, it must be an error message. Show the user. | |
2241 ;; But first wait to see if some more output is going to arrive. | |
2242 ;; Otherwise we get cool errors like "Can't open ". | |
2243 (sleep-for 1) | |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2244 (ispell-accept-output 3) |
6138 | 2245 (error "%s" (mapconcat 'identity ispell-filter "\n")))) |
2246 (setq ispell-filter nil) ; Discard version ID line | |
2247 (let ((extended-char-mode (ispell-get-extended-character-mode))) | |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2248 (if extended-char-mode ; ~ extended character mode |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2249 (ispell-send-string (concat extended-char-mode "\n")))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2250 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2251 (process-kill-without-query ispell-process)))) |
6138 | 2252 |
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
2253 ;;;###autoload |
6138 | 2254 (defun ispell-kill-ispell (&optional no-error) |
7607 | 2255 "Kill current Ispell process (so that you may start a fresh one). |
2256 With NO-ERROR, just return non-nil if there was no Ispell running." | |
6138 | 2257 (interactive) |
2258 (if (not (and ispell-process | |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2259 (eq (ispell-process-status) 'run))) |
6138 | 2260 (or no-error |
2261 (error "There is no ispell process running!")) | |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2262 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2263 (progn |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2264 (process-send-eof ispell-process) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2265 (if (eq (ispell-process-status) 'run) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2266 (ispell-accept-output 1)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2267 (if (eq (ispell-process-status) 'run) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2268 (kill-process ispell-process)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2269 (while (not (or (eq (ispell-process-status) 'exit) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2270 (eq (ispell-process-status) 'signal))) |
40412
acbdf8dbf6d4
(version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
39186
diff
changeset
|
2271 (sleep-for 0.25))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2272 ;; synchronous processes |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2273 (ispell-send-string "\n") ; make sure side effects occurred. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2274 (kill-buffer ispell-output-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2275 (kill-buffer ispell-session-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2276 (setq ispell-output-buffer nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2277 ispell-session-buffer nil)) |
6138 | 2278 (setq ispell-process nil) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2279 (message "Ispell process killed") |
6138 | 2280 nil)) |
2281 | |
2282 | |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2283 ;;; 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
|
2284 ;;; 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
|
2285 |
6138 | 2286 ;;;###autoload |
2287 (defun ispell-change-dictionary (dict &optional arg) | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2288 "Change `ispell-dictionary' (q.v.) to DICT and kill old Ispell process. |
6138 | 2289 A new one will be started as soon as necessary. |
2290 | |
2291 By just answering RET you can find out what the current dictionary is. | |
2292 | |
37545
931c07edd6e3
(ispell-change-dictionary): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
37426
diff
changeset
|
2293 With prefix argument, set the default dictionary." |
6138 | 2294 (interactive |
2295 (list (completing-read | |
2296 "Use new dictionary (RET for current, SPC to complete): " | |
2297 (cons (cons "default" nil) ispell-dictionary-alist) nil t) | |
2298 current-prefix-arg)) | |
2299 (if (equal dict "default") (setq dict nil)) | |
2300 ;; This relies on completing-read's bug of returning "" for no match | |
2301 (cond ((equal dict "") | |
2302 (message "Using %s dictionary" | |
2303 (or ispell-local-dictionary ispell-dictionary "default"))) | |
2304 ((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
|
2305 (or (null ispell-local-dictionary) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2306 (equal dict ispell-local-dictionary))) |
6138 | 2307 ;; 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
|
2308 (and (interactive-p) |
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2309 (message "No change, using %s dictionary" (or dict "default")))) |
6138 | 2310 (t ; reset dictionary! |
2311 (if (assoc dict ispell-dictionary-alist) | |
2312 (progn | |
2313 (if (or arg (null dict)) ; set default dictionary | |
2314 (setq ispell-dictionary dict)) | |
2315 (if (null arg) ; set local dictionary | |
2316 (setq ispell-local-dictionary dict))) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2317 (error "Undefined dictionary: %s" dict)) |
6138 | 2318 (ispell-kill-ispell t) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2319 (message "(Next %sIspell command will use %s dictionary)" |
6138 | 2320 (cond ((equal ispell-local-dictionary ispell-dictionary) |
2321 "") | |
2322 (arg "global ") | |
2323 (t "local ")) | |
2324 (or (if (or (equal ispell-local-dictionary ispell-dictionary) | |
2325 (null arg)) | |
2326 ispell-local-dictionary | |
2327 ispell-dictionary) | |
2328 "default"))))) | |
2329 | |
2330 | |
2331 ;;; Spelling of comments are checked when ispell-check-comments is non-nil. | |
2332 | |
2333 ;;;###autoload | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2334 (defun ispell-region (reg-start reg-end &optional recheckp shift) |
22461
8a7cf102704d
(ispell-region): Return non-nil if not aborted.
Richard M. Stallman <rms@gnu.org>
parents:
22046
diff
changeset
|
2335 "Interactively check a region for spelling errors. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2336 Return nil if spell session is quit, |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2337 otherwise returns shift offset amount for last line processed." |
6138 | 2338 (interactive "r") ; Don't flag errors on read-only bufs. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2339 (if (not recheckp) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2340 (ispell-accept-buffer-local-defs)) ; set up dictionary, local words, etc. |
6138 | 2341 (unwind-protect |
7606 | 2342 (save-excursion |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2343 (message "Spell checking %s using %s dictionary..." |
7606 | 2344 (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
|
2345 (buffer-name) "region") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2346 (or ispell-dictionary "default")) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2347 ;; Returns cursor to original location. |
7606 | 2348 (save-window-excursion |
2349 (goto-char reg-start) | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2350 (let ((transient-mark-mode) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2351 (case-fold-search case-fold-search) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2352 (skip-region-start (make-marker)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2353 (skip-regexp (ispell-begin-skip-region-regexp)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2354 (skip-alist ispell-skip-region-alist) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2355 key) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2356 (if (eq ispell-parser 'tex) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2357 (setq case-fold-search nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2358 skip-alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2359 (append (car ispell-tex-skip-alists) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2360 (car (cdr ispell-tex-skip-alists)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2361 skip-alist))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2362 (let (message-log-max) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2363 (message "searching for regions to skip")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2364 (if (re-search-forward skip-regexp reg-end t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2365 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2366 (setq key (buffer-substring-no-properties |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2367 (match-beginning 0) (match-end 0))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2368 (set-marker skip-region-start (- (point) (length key))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2369 (goto-char reg-start))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2370 (let (message-log-max) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2371 (message "Continuing spelling check using %s dictionary..." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2372 (or ispell-dictionary "default"))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2373 (set-marker ispell-region-end reg-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2374 (while (and (not ispell-quit) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2375 (< (point) ispell-region-end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2376 ;; spell-check region with skipping |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2377 (if (and (marker-position skip-region-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2378 (<= skip-region-start (point))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2379 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2380 (ispell-skip-region key skip-alist) ; moves pt past region. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2381 (setq reg-start (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2382 (if (and (< reg-start ispell-region-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2383 (re-search-forward skip-regexp |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2384 ispell-region-end t)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2385 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2386 (setq key (buffer-substring-no-properties |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2387 (car (match-data)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2388 (car (cdr (match-data))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2389 (set-marker skip-region-start |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2390 (- (point) (length key))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2391 (goto-char reg-start)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2392 (set-marker skip-region-start nil)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2393 (setq reg-end (if (marker-position skip-region-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2394 (min skip-region-start ispell-region-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2395 (marker-position ispell-region-end))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2396 (let* ((start (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2397 (end (save-excursion (end-of-line) (min (point) reg-end))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2398 (string (ispell-get-line start end reg-end))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2399 (setq end (point)) ; "end" tracks region retrieved. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2400 (if string ; there is something to spell check! |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2401 ;; (special start end) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2402 (setq shift (ispell-process-line string |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2403 (and recheckp shift)))) |
7606 | 2404 (goto-char end))))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2405 (if ispell-quit |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2406 nil |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2407 (or shift 0))) |
7606 | 2408 ;; protected |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2409 (if (and (not (and recheckp ispell-keep-choices-win)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2410 (get-buffer ispell-choices-buffer)) |
7606 | 2411 (kill-buffer ispell-choices-buffer)) |
2412 (if ispell-quit | |
2413 (progn | |
2414 ;; preserve or clear the region for ispell-continue. | |
2415 (if (not (numberp ispell-quit)) | |
2416 (set-marker ispell-region-end nil) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2417 ;; Ispell-continue enabled - ispell-region-end is set. |
7606 | 2418 (goto-char ispell-quit)) |
2419 ;; Check for aborting | |
2420 (if (and ispell-checking-message (numberp ispell-quit)) | |
2421 (progn | |
2422 (setq ispell-quit nil) | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2423 (error "Message send aborted"))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2424 (if (not recheckp) (setq ispell-quit nil))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2425 (if (not recheckp) (set-marker ispell-region-end nil)) |
7606 | 2426 ;; Only save if successful exit. |
2427 (ispell-pdict-save ispell-silently-savep) | |
2428 (message "Spell-checking done")))) | |
6138 | 2429 |
2430 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2431 ;;; Creates the regexp for skipping a region. |
22529 | 2432 ;;; Makes the skip-regexp local for tex buffers adding in the |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2433 ;;; tex expressions to skip as well. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2434 ;;; Call AFTER ispell-buffer-local-parsing. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2435 (defun ispell-begin-skip-region-regexp () |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2436 (let ((skip-regexp (ispell-begin-skip-region))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2437 (if (and (null ispell-check-comments) comment-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2438 (setq skip-regexp (concat (regexp-quote comment-start) "\\|" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2439 skip-regexp))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2440 (if (and (eq 'exclusive ispell-check-comments) comment-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2441 (setq skip-regexp (concat (if (string= "" comment-end) "^" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2442 (regexp-quote comment-end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2443 "\\|" skip-regexp))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2444 (if ispell-skip-tib |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2445 (setq skip-regexp (concat ispell-tib-ref-beginning "\\|" skip-regexp))) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2446 (if ispell-skip-html |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2447 (setq skip-regexp (concat "<[cC][oO][dD][eE]\\>[^>]*>" "\\|" |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2448 "<[sS][cC][rR][iI][pP][tT]\\>[^>]*>" "\\|" |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2449 "<[aA][pP][pP][lL][eE][tT]\\>[^>]*>" "\\|" |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2450 "<[vV][eE][rR][bB]\\>[^>]*>" "\\|" |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2451 ;; "<[tT][tT]\\>[^>]*>" "\\|" |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2452 "<[tT][tT]/" "\\|" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2453 "<" "\\|" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2454 "&" "\\|" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2455 skip-regexp))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2456 (if (eq ispell-parser 'tex) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2457 (setq skip-regexp (concat (ispell-begin-tex-skip-regexp) "\\|" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2458 skip-regexp))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2459 skip-regexp)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2460 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2461 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2462 (defun ispell-begin-tex-skip-regexp () |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2463 "Regular expression of tex commands to skip. |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2464 Generated from `ispell-tex-skip-alists'." |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2465 (concat |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2466 (mapconcat (function (lambda (lst) (car lst))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2467 (car ispell-tex-skip-alists) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2468 "\\|") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2469 "\\|" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2470 (mapconcat (function (lambda (lst) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2471 (concat "\\\\begin[ \t\n]*{[ \t\n]*" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2472 (car lst) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2473 "[ \t\n]*}"))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2474 (car (cdr ispell-tex-skip-alists)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2475 "\\|"))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2476 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2477 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2478 (defun ispell-begin-skip-region () |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2479 "Regular expression of regions to skip for all buffers. |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2480 Each selection should be a key of `ispell-skip-region-alist'; |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2481 otherwise, the current line is skipped." |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2482 (mapconcat (function (lambda (lst) (if (stringp (car lst)) (car lst) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2483 (eval (car lst))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2484 ispell-skip-region-alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2485 "\\|")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2486 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2487 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2488 (defun ispell-tex-arg-end (&optional arg) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2489 (condition-case nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2490 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2491 (while (looking-at "[ \t\n]*\\[") (forward-sexp)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2492 (forward-sexp (or arg 1))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2493 (error |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2494 (message "error skipping s-expressions at point %d." (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2495 (beep) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2496 (sit-for 2)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2497 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2498 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2499 ;;; Skips to region-end from point, or a single line. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2500 ;;; Places point at end of region skipped. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2501 (defun ispell-skip-region (key alist) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2502 ;; move over key to begin checking. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2503 (forward-char (length key)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2504 (let ((start (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2505 alist-key null-skip) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2506 (cond |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2507 ;; what about quoted comment, or comment inside strings? |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2508 ((and (null ispell-check-comments) comment-start |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2509 (string= key comment-start)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2510 (if (string= "" comment-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2511 (forward-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2512 (search-forward comment-end ispell-region-end t))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2513 ((and (eq 'exclusive ispell-check-comments) comment-start |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2514 (string= key comment-end)) |
22526
56bcedfdbe83
(ispell-skip-region): Don't complain when
Karl Heuer <kwzh@gnu.org>
parents:
22461
diff
changeset
|
2515 (search-forward comment-start ispell-region-end :end)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2516 ((and ispell-skip-tib (string-match ispell-tib-ref-beginning key)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2517 (re-search-forward ispell-tib-ref-end ispell-region-end t)) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2518 ((and ispell-skip-html (string-match "</" key)) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2519 (search-forward ">" ispell-region-end t)) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2520 ((and ispell-skip-html (string-match "<[cC][oO][dD][eE]\\>[^>]*>" key)) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2521 (search-forward-regexp "</[cC][oO][dD][eE]>" ispell-region-end t)) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2522 ((and ispell-skip-html |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2523 (string-match "<[sS][cC][rR][iI][pP][tT]\\>[^>]*>" key)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2524 (search-forward-regexp "</[sS][cC][rR][iI][pP][tT]>" ispell-region-end t)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2525 ((and ispell-skip-html |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2526 (string-match "<[aA][pP][pP][lL][eE][tT]\\>[^>]*>" key)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2527 (search-forward-regexp "</[aA][pP][pP][lL][eE][tT]>" ispell-region-end t)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2528 ((and ispell-skip-html (string-match "<[vV][eE][rR][bB]\\>[^>]*>" key)) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2529 (search-forward-regexp "</[vV][eE][rR][bB]>" ispell-region-end t)) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2530 ;;((and ispell-skip-html (string-match "<[tT][tT]\\>[^>]*>" key)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2531 ;; (search-forward-regexp "</[tT][tT]>" ispell-region-end t)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2532 ((and ispell-skip-html (string-match "<[tT][tT]/" key)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2533 (search-forward "/" ispell-region-end t)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2534 ((and ispell-skip-html (string-match "<" key)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2535 (search-forward ">" ispell-region-end t)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2536 ((and ispell-skip-html (string-match "&" key)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2537 (search-forward-regexp "[; \t\n]" ispell-region-end t)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2538 ;; markings from alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2539 (t |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2540 (while alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2541 (setq alist-key (eval (car (car alist)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2542 (if (string-match alist-key key) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2543 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2544 (setq alist (cdr (car alist))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2545 (cond |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2546 ((null alist) (setq null-skip t)) ; done! Just skip key. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2547 ((not (consp alist)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2548 ;; Search past end of spell region to find this region end. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2549 (re-search-forward (eval alist) (point-max) t)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2550 ((consp alist) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2551 (if (stringp alist) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2552 (re-search-forward alist (point-max) t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2553 (setq null-skip t) ; error handling in functions! |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2554 (if (consp (cdr alist)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2555 (apply (car alist) (cdr alist)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2556 (funcall (car alist)))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2557 (setq alist nil)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2558 (setq alist (cdr alist)))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2559 (if (and (= start (point)) (null null-skip)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2560 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2561 (message "Matching region end for `%s' point %d not found" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2562 key (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2563 (beep) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2564 (sit-for 2))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2565 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2566 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2567 ;;; Grab the next line of data. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2568 ;;; Returns a string with the line data |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2569 (defun ispell-get-line (start end reg-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2570 (let ((ispell-casechars (ispell-get-casechars)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2571 string) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2572 (cond ; LOOK AT THIS LINE AND SKIP OR PROCESS |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2573 ((eolp) ; END OF LINE, just go to next line. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2574 (forward-line)) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2575 ;;((looking-at "[-#@*+!%~^]") ; SKIP SPECIAL ISPELL CHARACTERS |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2576 ;; (forward-char 1)) ; not needed as quoted below. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2577 ((or (re-search-forward ispell-casechars end t) ; TEXT EXISTS |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2578 (re-search-forward "[][()${}]" end t)) ; or MATH COMMANDS |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2579 (setq string (concat "^" (buffer-substring-no-properties start end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2580 "\n")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2581 (goto-char end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2582 (t (goto-char end))) ; EMPTY LINE, skip it. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2583 string)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2584 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2585 |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2586 ;;; Avoid error messages when compiling for these dynamic variables. |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2587 (eval-when-compile |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2588 (defvar start) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2589 (defvar end)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2590 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2591 (defun ispell-process-line (string shift) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2592 "Sends a LINE of text to ispell and processes the result. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2593 This will modify the buffer for spelling errors. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2594 Requires variables START and END to be defined in its lexical scope. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2595 Returns the sum shift due to changes in word replacements." |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2596 ;;(declare special start end) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2597 (let (poss accept-list) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2598 (if (not (numberp shift)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2599 (setq shift 0)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2600 ;; send string to spell process and get input. |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2601 (ispell-send-string string) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2602 (while (progn |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2603 (ispell-accept-output) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2604 ;; Last item of output contains a blank line. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2605 (not (string= "" (car ispell-filter))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2606 ;; parse all inputs from the stream one word at a time. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2607 ;; Place in FIFO order and remove the blank item. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2608 (setq ispell-filter (nreverse (cdr ispell-filter))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2609 (while (and (not ispell-quit) ispell-filter) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2610 ;; get next word, accounting for accepted words and start shifts |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2611 (setq poss (ispell-parse-output (car ispell-filter) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2612 accept-list shift)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2613 (if (and poss (listp poss)) ; spelling error occurred. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2614 ;; Whenever we have misspellings, we can change |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2615 ;; the buffer. Keep boundaries as markers. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2616 ;; Markers can move with highlighting! This destroys |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2617 ;; end of region markers line-end and ispell-region-end |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2618 (let ((word-start |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2619 (copy-marker (+ start ispell-offset (car (cdr poss))))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2620 (word-len (length (car poss))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2621 (line-end (copy-marker end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2622 (line-start (copy-marker start)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2623 recheck-region replace) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2624 (goto-char word-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2625 ;; Adjust the horizontal scroll & point |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2626 (ispell-horiz-scroll) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2627 (goto-char (+ word-len word-start)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2628 (ispell-horiz-scroll) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2629 (goto-char word-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2630 (ispell-horiz-scroll) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2631 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2632 ;; Alignment cannot be tracked and this error will occur when |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2633 ;; `query-replace' makes multiple corrections on the starting line. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2634 (if (/= (+ word-len (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2635 (progn |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2636 ;; NB: Search can fail with Mule character sets that don't |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2637 ;; display properly. Ignore the error in this case? |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2638 (search-forward (car poss) (+ word-len (point)) t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2639 (point))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2640 ;; This occurs due to filter pipe problems |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2641 (error (concat "Ispell misalignment: word " |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2642 "`%s' point %d; probably incompatible versions") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2643 (car poss) (marker-position word-start))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2644 ;; ispell-cmd-loop can go recursive & change buffer |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2645 (if ispell-keep-choices-win |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2646 (setq replace (ispell-command-loop |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2647 (car (cdr (cdr poss))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2648 (car (cdr (cdr (cdr poss)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2649 (car poss) (marker-position word-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2650 (+ word-len (marker-position word-start)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2651 (save-window-excursion |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2652 (setq replace (ispell-command-loop |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2653 (car (cdr (cdr poss))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2654 (car (cdr (cdr (cdr poss)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2655 (car poss) (marker-position word-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2656 (+ word-len (marker-position word-start)))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2657 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2658 (goto-char word-start) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2659 ;; Recheck when query replace edit changes misspelled word. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2660 ;; Error in tex mode when a potential math mode change exists. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2661 (if (and replace (listp replace) (= 2 (length replace))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2662 (if (and (eq ispell-parser 'tex) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2663 (string-match "[\\\\][]()[]\\|\\\\begin\\|\\$" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2664 (regexp-quote string))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2665 (error |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2666 "Don't start query replace on a line with math characters" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2667 ) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2668 (set-marker line-end (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2669 (setq ispell-filter nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2670 recheck-region t))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2671 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2672 ;; insert correction if needed |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2673 (cond |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2674 ((or (null replace) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2675 (equal 0 replace)) ; ACCEPT/INSERT |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2676 (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2677 (ispell-add-per-file-word-list (car poss))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2678 ;; do not recheck accepted word on this line |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2679 (setq accept-list (cons (car poss) accept-list))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2680 (t ; replacement word selected or entered |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2681 (delete-region (point) (+ word-len (point))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2682 (if (not (listp replace)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2683 (progn |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2684 (insert replace) ; insert dictionary word |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2685 (setq accept-list (cons replace accept-list))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2686 (let ((replace-word (car replace))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2687 ;; Recheck hand entered replacement word |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2688 (insert replace-word) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2689 (if (car (cdr replace)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2690 (save-window-excursion |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2691 (delete-other-windows) ; to correctly show help. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2692 ;; Assume case-replace & |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2693 ;; case-fold-search correct? |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2694 (query-replace (car poss) (car replace) t))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2695 (goto-char word-start) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2696 ;; do not recheck if already accepted |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2697 (if (member replace-word accept-list) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2698 (setq accept-list (cons replace-word accept-list) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2699 replace replace-word) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2700 (let ((region-end (copy-marker ispell-region-end))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2701 (setq recheck-region ispell-filter |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2702 ispell-filter nil ; save filter |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2703 shift 0 ; already accounted |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2704 shift (ispell-region |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2705 word-start |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2706 (+ word-start (length replace-word)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2707 t shift)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2708 (if (null shift) ; quitting check. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2709 (setq shift 0)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2710 (set-marker ispell-region-end region-end) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2711 (set-marker region-end nil) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2712 (setq ispell-filter recheck-region |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2713 recheck-region nil |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2714 replace replace-word))))) |
27009
2439fc8b756c
(ispell-process-line): Add local var line-offset to adjust for the change
Richard M. Stallman <rms@gnu.org>
parents:
26442
diff
changeset
|
2715 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2716 (setq shift (+ shift (- (length replace) word-len))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2717 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2718 ;; Move line-start across word... |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2719 ;; new shift function does this now... |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2720 ;;(set-marker line-start (+ line-start |
28616
313ef0d76864
(ispell-menu-map-needed): Check that ispell-process
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28563
diff
changeset
|
2721 ;; (- (length replace) |
313ef0d76864
(ispell-menu-map-needed): Check that ispell-process
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28563
diff
changeset
|
2722 ;; (length (car poss))))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2723 )) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2724 (if (not ispell-quit) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2725 (let (message-log-max) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2726 (message "Continuing spelling check using %s dictionary..." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2727 (or ispell-dictionary "default")))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2728 (sit-for 0) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2729 (setq start (marker-position line-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2730 end (marker-position line-end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2731 ;; Adjust markers when end of region lost from highlighting. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2732 (if (and (not recheck-region) (< end (+ word-start word-len))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2733 (setq end (+ word-start word-len))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2734 (if (= word-start ispell-region-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2735 (set-marker ispell-region-end (+ word-start word-len))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2736 ;; going out of scope - unneeded |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2737 (set-marker line-start nil) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2738 (set-marker word-start nil) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2739 (set-marker line-end nil))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2740 ;; finished with misspelling! |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2741 (setq ispell-filter (cdr ispell-filter))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2742 shift)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2743 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2744 |
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2745 ;;;###autoload |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2746 (defun ispell-comments-and-strings () |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2747 "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
|
2748 (interactive) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2749 (goto-char (point-min)) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2750 (let (state done) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2751 (while (not done) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2752 (setq done t) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2753 (setq state (parse-partial-sexp (point) (point-max) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2754 nil nil state 'syntax-table)) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2755 (if (or (nth 3 state) (nth 4 state)) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2756 (let ((start (point))) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2757 (setq state (parse-partial-sexp start (point-max) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2758 nil nil state 'syntax-table)) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2759 (if (or (nth 3 state) (nth 4 state)) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2760 (error "Unterminated string or comment")) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2761 (save-excursion |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2762 (setq done (not (ispell-region start (point)))))))))) |
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2763 |
6138 | 2764 |
2765 ;;;###autoload | |
7606 | 2766 (defun ispell-buffer () |
6138 | 2767 "Check the current buffer for spelling errors interactively." |
2768 (interactive) | |
2769 (ispell-region (point-min) (point-max))) | |
2770 | |
7606 | 2771 |
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
2772 ;;;###autoload |
6138 | 2773 (defun ispell-continue () |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2774 "Continue a halted spelling session beginning with the current word." |
6138 | 2775 (interactive) |
2776 (if (not (marker-position ispell-region-end)) | |
2777 (message "No session to continue. Use 'X' command when checking!") | |
2778 (if (not (equal (marker-buffer ispell-region-end) (current-buffer))) | |
2779 (message "Must continue ispell from buffer %s" | |
2780 (buffer-name (marker-buffer ispell-region-end))) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2781 (ispell-region |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2782 ;; find beginning of current word: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2783 (car (cdr (ispell-get-word t))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2784 (marker-position ispell-region-end))))) |
6138 | 2785 |
2786 | |
2787 ;;; Horizontal scrolling | |
7606 | 2788 (defun ispell-horiz-scroll () |
2789 "Places point within the horizontal visibility of its window area." | |
6138 | 2790 (if truncate-lines ; display truncating lines? |
2791 ;; See if display needs to be scrolled. | |
2792 (let ((column (- (current-column) (max (window-hscroll) 1)))) | |
2793 (if (and (< column 0) (> (window-hscroll) 0)) | |
2794 (scroll-right (max (- column) 10)) | |
2795 (if (>= column (- (window-width) 2)) | |
2796 (scroll-left (max (- column (window-width) -3) 10))))))) | |
2797 | |
2798 | |
2799 ;;; Interactive word completion. | |
2800 ;;; Forces "previous-word" processing. Do we want to make this selectable? | |
2801 | |
2802 ;;;###autoload | |
2803 (defun ispell-complete-word (&optional interior-frag) | |
41949
66bf9fec7803
(ispell-complete-word): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
41937
diff
changeset
|
2804 "Try to complete the word before or under point (see `lookup-words'). |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2805 If optional INTERIOR-FRAG is non-nil then the word may be a character |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2806 sequence inside of a word. |
6138 | 2807 |
2808 Standard ispell choices are then available." | |
2809 (interactive "P") | |
2810 (let ((cursor-location (point)) | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2811 (case-fold-search-val case-fold-search) |
6138 | 2812 (word (ispell-get-word nil "\\*")) ; force "previous-word" processing. |
2813 start end possibilities replacement) | |
2814 (setq start (car (cdr word)) | |
2815 end (car (cdr (cdr word))) | |
2816 word (car word) | |
2817 possibilities | |
2818 (or (string= word "") ; Will give you every word | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2819 (lookup-words (concat (and interior-frag "*") word |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2820 (if (or interior-frag (null ispell-look-p)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2821 "*")) |
6138 | 2822 ispell-complete-word-dict))) |
2823 (cond ((eq possibilities t) | |
2824 (message "No word to complete")) | |
2825 ((null possibilities) | |
2826 (message "No match for \"%s\"" word)) | |
2827 (t ; There is a modification... | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2828 (setq case-fold-search nil) ; Try and respect case of word. |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2829 (cond |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2830 ((string-equal (upcase word) word) |
7606 | 2831 (setq possibilities (mapcar 'upcase possibilities))) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2832 ((string-equal (upcase (substring word 0 1)) (substring word 0 1)) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2833 (setq possibilities (mapcar (function |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2834 (lambda (pos) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2835 (if (string-equal |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2836 (substring word 0 1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2837 (substring pos 0 1)) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2838 pos |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2839 (capitalize pos)))) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2840 possibilities)))) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2841 (setq case-fold-search case-fold-search-val) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2842 (save-window-excursion |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2843 (setq replacement |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2844 (ispell-command-loop possibilities nil word start end))) |
6138 | 2845 (cond |
2846 ((equal 0 replacement) ; BUFFER-LOCAL ADDITION | |
2847 (ispell-add-per-file-word-list word)) | |
2848 (replacement ; REPLACEMENT WORD | |
2849 (delete-region start end) | |
2850 (setq word (if (atom replacement) replacement (car replacement)) | |
2851 cursor-location (+ (- (length word) (- end start)) | |
2852 cursor-location)) | |
2853 (insert word) | |
2854 (if (not (atom replacement)) ; recheck spelling of replacement. | |
2855 (progn | |
2856 (goto-char cursor-location) | |
2857 (ispell-word nil t))))) | |
2858 (if (get-buffer ispell-choices-buffer) | |
2859 (kill-buffer ispell-choices-buffer)))) | |
2860 (ispell-pdict-save ispell-silently-savep) | |
2861 (goto-char cursor-location))) | |
2862 | |
2863 | |
2864 ;;;###autoload | |
2865 (defun ispell-complete-word-interior-frag () | |
7606 | 2866 "Completes word matching character sequence inside a word." |
6138 | 2867 (interactive) |
2868 (ispell-complete-word t)) | |
2869 | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2870 |
30563
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2871 ;;;###autoload |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2872 (defun ispell () |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2873 "Interactively check a region or buffer for spelling errors. |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2874 If `transient-mark-mode' is on, and a region is active, spell-check |
34364 | 2875 that region. Otherwise spell-check the buffer. |
2876 | |
2877 Ispell dictionaries are not distributed with Emacs. If you are | |
2878 looking for a dictionary, please see the distribution of the GNU ispell | |
2879 program, or do an Internet search; there are various dictionaries | |
2880 available on the net." | |
30563
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2881 (interactive) |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2882 (if (and transient-mark-mode mark-active) |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2883 (ispell-region (region-beginning) (region-end)) |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2884 (ispell-buffer))) |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2885 |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2886 |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2887 ;;; ********************************************************************** |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2888 ;;; Ispell Minor Mode |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2889 ;;; ********************************************************************** |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2890 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2891 (defvar ispell-minor-mode nil |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2892 "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
|
2893 ;; 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
|
2894 (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
|
2895 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2896 (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
|
2897 (setq minor-mode-alist |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2898 (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
|
2899 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2900 (defvar ispell-minor-keymap |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2901 (let ((map (make-sparse-keymap))) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2902 (define-key map " " 'ispell-minor-check) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2903 (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
|
2904 map) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2905 "Keymap used for Ispell minor mode.") |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2906 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2907 (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
|
2908 (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
|
2909 (setq minor-mode-map-alist |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2910 (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
|
2911 minor-mode-map-alist))) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2912 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2913 ;;;###autoload |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2914 (defun ispell-minor-mode (&optional arg) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2915 "Toggle Ispell minor mode. |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2916 With prefix arg, turn Ispell minor mode on iff arg is positive. |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2917 |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2918 In Ispell minor mode, pressing SPC or RET |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2919 warns you if the previous word is incorrectly spelled. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2920 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2921 All the buffer-local variables and dictionaries are ignored -- to read |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2922 them into the running ispell process, type \\[ispell-word] SPC." |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2923 (interactive "P") |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2924 (setq ispell-minor-mode |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2925 (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
|
2926 (<= (prefix-numeric-value arg) 0)))) |
11562
8ff50a0715e1
(ispell-minor-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11469
diff
changeset
|
2927 (force-mode-line-update)) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2928 |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2929 (defun ispell-minor-check () |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2930 "Check previous word then continue with the normal binding of this key. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2931 Don't check previous word when character before point is a space or newline. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2932 Don't read buffer-local settings or word lists." |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2933 (interactive "*") |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2934 (let ((ispell-minor-mode nil) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2935 (ispell-check-only t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2936 (last-char (char-after (1- (point))))) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2937 (command-execute (key-binding (this-command-keys))) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2938 (if (not (or (eq last-char ?\ ) (eq last-char ?\n) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2939 (and ispell-skip-html (eq last-char ?>)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2940 (and ispell-skip-html (eq last-char ?\;)))) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2941 (ispell-word nil t)))) |
6138 | 2942 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2943 |
6138 | 2944 ;;; ********************************************************************** |
2945 ;;; Ispell Message | |
2946 ;;; ********************************************************************** | |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2947 ;;; 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
|
2948 |
6138 | 2949 |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2950 (defvar ispell-message-text-end |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2951 (mapconcat (function identity) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2952 '( |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2953 ;; Don't spell check signatures |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2954 "^-- $" |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2955 ;; Matches postscript files. |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2956 "^%!PS-Adobe-[123].0" |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2957 ;; Matches uuencoded text |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2958 "^begin [0-9][0-9][0-9] .*\nM.*\nM.*\nM" |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2959 ;; Matches shell files (especially auto-decoding) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2960 "^#! /bin/[ck]?sh" |
8387
7dca276b66d8
(ispell-message-text-end): Improve context diff regexp.
Richard M. Stallman <rms@gnu.org>
parents:
8298
diff
changeset
|
2961 ;; Matches context difference listing |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2962 "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2963 ;; Matches unidiff difference listing |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2964 "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@\n" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2965 ;; Matches reporter.el bug report |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2966 "^current state:\n==============\n" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2967 ;; Matches commonly used "cut" boundaries |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2968 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|Environment Follows\\)") |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2969 "\\|") |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2970 "*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
|
2971 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
|
2972 Otherwise, it must be a function which is called to get the limit.") |
6138 | 2973 |
7606 | 2974 |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2975 |
6138 | 2976 ;;;###autoload |
2977 (defun ispell-message () | |
2978 "Check the spelling of a mail message or news post. | |
2979 Don't check spelling of message headers except the Subject field. | |
2980 Don't check included messages. | |
2981 | |
15551
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2982 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
|
2983 use the `x' command. (Any subsequent regions will be checked.) |
7607 | 2984 The `X' command aborts the message send so that you can edit the buffer. |
6138 | 2985 |
2986 To spell-check whenever a message is sent, include the appropriate lines | |
2987 in your .emacs file: | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2988 (add-hook 'message-send-hook 'ispell-message) ;; GNUS 5 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2989 (add-hook 'news-inews-hook 'ispell-message) ;; GNUS 4 |
6138 | 2990 (add-hook 'mail-send-hook 'ispell-message) |
2991 (add-hook 'mh-before-send-letter-hook 'ispell-message) | |
2992 | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2993 You can bind this to the key C-c i in GNUS or mail by adding to |
7607 | 2994 `news-reply-mode-hook' or `mail-mode-hook' the following lambda expression: |
6138 | 2995 (function (lambda () (local-set-key \"\\C-ci\" 'ispell-message)))" |
2996 (interactive) | |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2997 (save-excursion |
7606 | 2998 (goto-char (point-min)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2999 (let* ( |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3000 ;; Nil when message came from outside (eg calling emacs as editor) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3001 ;; Non-nil marker of end of headers. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3002 (internal-messagep |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3003 (re-search-forward |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3004 (concat "^" (regexp-quote mail-header-separator) "$") nil t)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3005 (end-of-headers ; Start of body. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3006 (copy-marker |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3007 (or internal-messagep |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3008 (re-search-forward "^$" nil t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3009 (point-min)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3010 (limit (copy-marker ; End of region we will spell check. |
7606 | 3011 (cond |
3012 ((not ispell-message-text-end) (point-max)) | |
3013 ((char-or-string-p ispell-message-text-end) | |
3014 (if (re-search-forward ispell-message-text-end nil t) | |
3015 (match-beginning 0) | |
3016 (point-max))) | |
3017 (t (min (point-max) (funcall ispell-message-text-end)))))) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3018 (default-prefix ; Vanilla cite prefix (just used for cite-regexp) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3019 (if (and (boundp 'mail-yank-prefix) mail-yank-prefix) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3020 (ispell-non-empty-string mail-yank-prefix) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3021 " \\|\t")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3022 (cite-regexp ;Prefix of quoted text |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3023 (cond |
28616
313ef0d76864
(ispell-menu-map-needed): Check that ispell-process
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28563
diff
changeset
|
3024 ((functionp 'sc-cite-regexp) ; sc 3.0 |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3025 (concat "\\(" (sc-cite-regexp) "\\)" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3026 (ispell-non-empty-string sc-reference-tag-string))) |
28616
313ef0d76864
(ispell-menu-map-needed): Check that ispell-process
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28563
diff
changeset
|
3027 ((boundp 'sc-cite-regexp) ; sc 2.3 |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3028 (concat "\\(" sc-cite-regexp "\\)" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3029 (ispell-non-empty-string sc-reference-tag-string))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3030 ((or (equal major-mode 'news-reply-mode) ;GNUS 4 & below |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3031 (equal major-mode 'message-mode)) ;GNUS 5 |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3032 (concat "In article <" "\\|" |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3033 "[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3034 message-yank-prefix "\\|" |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3035 default-prefix)) |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3036 ((equal major-mode 'mh-letter-mode) ; mh mail message |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3037 (concat "[^,;&+=\n]+ writes:" "\\|" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3038 (ispell-non-empty-string mh-ins-buf-prefix))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3039 ((not internal-messagep) ; Assume nn sent us this message. |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3040 (concat "In [a-zA-Z.]+ you write:" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3041 "In <[^,;&+=]+> [^,;&+=]+ writes:" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3042 " *> *")) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3043 ((boundp 'vm-included-text-prefix) ; VM mail message |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3044 (concat "[^,;&+=\n]+ writes:" "\\|" |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3045 (ispell-non-empty-string vm-included-text-prefix))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3046 (t default-prefix))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3047 (ispell-skip-region-alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3048 (cons (list (concat "^\\(" cite-regexp "\\)") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3049 (function forward-line)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3050 ispell-skip-region-alist)) |
7606 | 3051 (old-case-fold-search case-fold-search) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3052 (dictionary-alist ispell-message-dictionary-alist) |
7606 | 3053 (ispell-checking-message t)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3054 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3055 ;; Select dictionary for message |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3056 (or (local-variable-p 'ispell-local-dictionary (current-buffer)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3057 (while dictionary-alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3058 (goto-char (point-min)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3059 (if (re-search-forward (car (car dictionary-alist)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3060 end-of-headers t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3061 (setq ispell-local-dictionary (cdr (car dictionary-alist)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3062 dictionary-alist nil) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3063 (setq dictionary-alist (cdr dictionary-alist))))) |
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
3064 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3065 (unwind-protect |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3066 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3067 ;; Spell check any original Subject: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3068 (goto-char (point-min)) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3069 (setq case-fold-search t) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3070 (if (re-search-forward "^Subject: *" end-of-headers t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3071 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3072 (goto-char (match-end 0)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3073 (if (and (not (looking-at ".*Re\\>")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3074 (not (looking-at "\\["))) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3075 (progn |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3076 (setq case-fold-search old-case-fold-search) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3077 (ispell-region (point) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3078 (progn ;Tab-initiated continuation lns. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3079 (end-of-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3080 (while (looking-at "\n[ \t]") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3081 (end-of-line 2)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3082 (point))))))) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3083 (setq case-fold-search old-case-fold-search) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3084 (goto-char end-of-headers) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3085 (forward-line 1) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3086 (ispell-region (point) limit)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3087 (set-marker end-of-headers nil) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3088 (set-marker limit nil))))) |
7606 | 3089 |
6138 | 3090 |
3091 (defun ispell-non-empty-string (string) | |
3092 (if (or (not string) (string-equal string "")) | |
3093 "\\'\\`" ; An unmatchable string if string is null. | |
3094 (regexp-quote string))) | |
3095 | |
3096 | |
3097 ;;; ********************************************************************** | |
3098 ;;; Buffer Local Functions | |
3099 ;;; ********************************************************************** | |
3100 | |
3101 | |
3102 (defun ispell-accept-buffer-local-defs () | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3103 "Load all buffer-local information, restarting Ispell when necessary." |
6138 | 3104 (ispell-buffer-local-dict) ; May kill ispell-process. |
3105 (ispell-buffer-local-words) ; Will initialize ispell-process. | |
3106 (ispell-buffer-local-parsing)) | |
3107 | |
3108 | |
3109 (defun ispell-buffer-local-parsing () | |
7607 | 3110 "Place Ispell into parsing mode for this buffer. |
7606 | 3111 Overrides the default parsing mode. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3112 Includes Latex/Nroff modes and extended character mode." |
6138 | 3113 ;; (ispell-init-process) must already be called. |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3114 (ispell-send-string "!\n") ; Put process in terse mode. |
6138 | 3115 ;; We assume all major modes with "tex-mode" in them should use latex parsing |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3116 ;; When exclusively checking comments, set to raw text mode (nroff). |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3117 (if (and (not (eq 'exclusive ispell-check-comments)) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3118 (or (and (eq ispell-parser 'use-mode-name) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3119 (string-match "[Tt][Ee][Xx]-mode" |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3120 (symbol-name major-mode))) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3121 (eq ispell-parser 'tex))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3122 (progn |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3123 (ispell-send-string "+\n") ; set ispell mode to tex |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3124 (if (not (eq ispell-parser 'tex)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3125 (set (make-local-variable 'ispell-parser) 'tex))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3126 (ispell-send-string "-\n")) ; set mode to normal (nroff) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3127 ;; If needed, test for SGML & HTML modes and set a buffer local nil/t value. |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3128 (if (and ispell-skip-html (not (eq ispell-skip-html t))) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3129 (set (make-local-variable 'ispell-skip-html) |
41937
9ad71f03b20b
(ispell-buffer-local-parsing): Match xml like sgml.
Richard M. Stallman <rms@gnu.org>
parents:
41773
diff
changeset
|
3130 (not (null (string-match "sgml\\|html\\|xml" |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3131 (downcase (symbol-name major-mode))))))) |
6138 | 3132 ;; Set default extended character mode for given buffer, if any. |
3133 (let ((extended-char-mode (ispell-get-extended-character-mode))) | |
3134 (if extended-char-mode | |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3135 (ispell-send-string (concat extended-char-mode "\n")))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
3136 ;; Set buffer-local parsing mode and extended character mode, if specified. |
6138 | 3137 (save-excursion |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3138 (goto-char (point-max)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3139 ;; Uses last occurrence of ispell-parsing-keyword |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3140 (if (search-backward ispell-parsing-keyword nil t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3141 (let ((end (save-excursion (end-of-line) (point))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3142 string) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3143 (search-forward ispell-parsing-keyword) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3144 (while (re-search-forward " *\\([^ \"]+\\)" end t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3145 ;; space separated definitions. |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3146 (setq string (downcase (buffer-substring-no-properties |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3147 (match-beginning 1) (match-end 1)))) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3148 (cond ((and (string-match "latex-mode" string) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3149 (not (eq 'exclusive ispell-check-comments))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3150 (ispell-send-string "+\n~tex\n")) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3151 ((string-match "nroff-mode" string) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3152 (ispell-send-string "-\n~nroff\n")) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3153 ((string-match "~" string) ; Set extended character mode. |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3154 (ispell-send-string (concat string "\n"))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3155 (t (message "Invalid Ispell Parsing argument!") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3156 (sit-for 2)))))))) |
6138 | 3157 |
3158 | |
3159 ;;; Can kill the current ispell process | |
3160 | |
3161 (defun ispell-buffer-local-dict () | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3162 "Initializes local dictionary and local personal dictionary. |
6138 | 3163 When a dictionary is defined in the buffer (see variable |
7607 | 3164 `ispell-dictionary-keyword'), it will override the local setting |
6138 | 3165 from \\[ispell-change-dictionary]. |
3166 Both should not be used to define a buffer-local dictionary." | |
3167 (save-excursion | |
3168 (goto-char (point-min)) | |
3169 (let (end) | |
3170 ;; Override the local variable definition. | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3171 ;; Uses last occurrence of ispell-dictionary-keyword. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3172 (goto-char (point-max)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3173 (if (search-backward ispell-dictionary-keyword nil t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3174 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3175 (search-forward ispell-dictionary-keyword) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3176 (setq end (save-excursion (end-of-line) (point))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3177 (if (re-search-forward " *\\([^ \"]+\\)" end t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3178 (setq ispell-local-dictionary |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3179 (buffer-substring-no-properties (match-beginning 1) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3180 (match-end 1)))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3181 (goto-char (point-max)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3182 (if (search-backward ispell-pdict-keyword nil t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3183 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3184 (search-forward ispell-pdict-keyword) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3185 (setq end (save-excursion (end-of-line) (point))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3186 (if (re-search-forward " *\\([^ \"]+\\)" end t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3187 (setq ispell-local-pdict |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3188 (buffer-substring-no-properties (match-beginning 1) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3189 (match-end 1)))))))) |
6138 | 3190 ;; Reload if new personal dictionary defined. |
3191 (if (and ispell-local-pdict | |
3192 (not (equal ispell-local-pdict ispell-personal-dictionary))) | |
3193 (progn | |
3194 (ispell-kill-ispell t) | |
3195 (setq ispell-personal-dictionary ispell-local-pdict))) | |
3196 ;; Reload if new dictionary defined. | |
3197 (if (and ispell-local-dictionary | |
3198 (not (equal ispell-local-dictionary ispell-dictionary))) | |
3199 (ispell-change-dictionary ispell-local-dictionary))) | |
3200 | |
3201 | |
3202 (defun ispell-buffer-local-words () | |
7607 | 3203 "Loads the buffer-local dictionary in the current buffer." |
6138 | 3204 (if (and ispell-buffer-local-name |
3205 (not (equal ispell-buffer-local-name (buffer-name)))) | |
3206 (progn | |
3207 (ispell-kill-ispell t) | |
3208 (setq ispell-buffer-local-name nil))) | |
3209 (ispell-init-process) | |
3210 (save-excursion | |
3211 (goto-char (point-min)) | |
3212 (while (search-forward ispell-words-keyword nil t) | |
3213 (or ispell-buffer-local-name | |
3214 (setq ispell-buffer-local-name (buffer-name))) | |
3215 (let ((end (save-excursion (end-of-line) (point))) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3216 (ispell-casechars (ispell-get-casechars)) |
6138 | 3217 string) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
3218 ;; buffer-local words separated by a space, and can contain |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3219 ;; any character other than a space. Not rigorous enough. |
8613
7db17ee1ae58
(ispell-buffer-local-words): Don't treat doublequote
Richard M. Stallman <rms@gnu.org>
parents:
8387
diff
changeset
|
3220 (while (re-search-forward " *\\([^ ]+\\)" end t) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3221 (setq string (buffer-substring-no-properties (match-beginning 1) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3222 (match-end 1))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3223 ;; This can fail when string contains a word with illegal chars. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3224 ;; Error handling needs to be added between ispell and emacs. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3225 (if (and (< 1 (length string)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3226 (equal 0 (string-match ispell-casechars string))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3227 (ispell-send-string (concat "@" string "\n")))))))) |
6138 | 3228 |
3229 | |
3230 ;;; returns optionally adjusted region-end-point. | |
3231 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3232 (defun ispell-add-per-file-word-list (word) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3233 "Add WORD to the per-file word list." |
6138 | 3234 (or ispell-buffer-local-name |
3235 (setq ispell-buffer-local-name (buffer-name))) | |
3236 (save-excursion | |
3237 (goto-char (point-min)) | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3238 (let ((old-case-fold-search case-fold-search) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3239 line-okay search done found) |
6138 | 3240 (while (not done) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3241 (setq case-fold-search nil |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3242 search (search-forward ispell-words-keyword nil 'move) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3243 found (or found search) |
6138 | 3244 line-okay (< (+ (length word) 1 ; 1 for space after word.. |
3245 (progn (end-of-line) (current-column))) | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3246 80) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3247 case-fold-search old-case-fold-search) |
6138 | 3248 (if (or (and search line-okay) |
3249 (null search)) | |
3250 (progn | |
3251 (setq done t) | |
3252 (if (null search) | |
3253 (progn | |
3254 (open-line 1) | |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3255 (unless found (newline)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3256 (insert (concat comment-start " " ispell-words-keyword)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3257 (if (> (length comment-end) 0) |
6138 | 3258 (save-excursion |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3259 (newline) |
6138 | 3260 (insert comment-end))))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3261 (insert (concat " " word)))))))) |
6138 | 3262 |
29078 | 3263 (add-to-list 'debug-ignored-errors "^No word found to check!$") |
6138 | 3264 |
3265 (provide 'ispell) | |
3266 | |
3267 | |
3268 ;;; LOCAL VARIABLES AND BUFFER-LOCAL VALUE EXAMPLES. | |
3269 | |
3270 ;;; Local Variable options: | |
3271 ;;; mode: name(-mode) | |
3272 ;;; eval: expression | |
3273 ;;; local-variable: value | |
3274 | |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3275 ;;; The following sets the buffer local dictionary to `american' English |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3276 ;;; and spell checks only comments. |
6138 | 3277 |
3278 ;;; Local Variables: | |
3279 ;;; mode: emacs-lisp | |
3280 ;;; comment-column: 40 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3281 ;;; ispell-check-comments: exclusive |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3282 ;;; ispell-local-dictionary: "american" |
6138 | 3283 ;;; End: |
3284 | |
3285 | |
3286 ;;; MORE EXAMPLES OF ISPELL BUFFER-LOCAL VALUES | |
3287 | |
3288 ;;; The following places this file in nroff parsing and extended char modes. | |
3289 ;;; Local IspellParsing: nroff-mode ~nroff | |
3290 ;;; Change IspellPersDict to IspellPersDict: to enable the following line. | |
3291 ;;; Local IspellPersDict ~/.ispell_lisp | |
3292 ;;; The following were automatically generated by ispell using the 'A' command: | |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3293 ; LocalWords: settable alist inews mh frag pdict Wildcards iconify arg tex kss |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3294 ; LocalWords: alists minibuffer bufferp autoload loaddefs aff Dansk KOI SPC op |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3295 ; LocalWords: Francais Nederlands charset autoloaded popup nonmenu regexp num |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3296 ; LocalWords: AMStex hspace includeonly nocite epsfig displaymath eqnarray reg |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3297 ; LocalWords: minipage modeline pers dict unhighlight buf grep sync prev inc |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3298 ; LocalWords: fn hilight oldot NB AIX msg init read's bufs pt cmd Quinlan eg |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3299 ; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3300 ; LocalWords: lns XEmacs HTML casechars Multibyte |
6138 | 3301 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3302 ;;; ispell.el ends here |