Mercurial > emacs
annotate lisp/textmodes/ispell.el @ 65323:aaa20cd9d459
*** empty log message ***
author | Thien-Thi Nguyen <ttn@gnuvola.org> |
---|---|
date | Sat, 03 Sep 2005 18:35:52 +0000 |
parents | 330e799da016 |
children | 5386c7235881 a3716f7538f2 |
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 |
64751
5b1a238fcbb4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64196
diff
changeset
|
3 ;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, |
5b1a238fcbb4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64196
diff
changeset
|
4 ;; 2004, 2005 Free Software Foundation, Inc. |
13337 | 5 |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37545
diff
changeset
|
6 ;; Author: Ken Stevens <k.stevens@ieee.org> |
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37545
diff
changeset
|
7 ;; Maintainer: Ken Stevens <k.stevens@ieee.org> |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
8 ;; Stevens Mod Date: Mon Jan 7 12:32:44 PST 2003 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
9 ;; Stevens Revision: 3.6 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
10 ;; 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
|
11 ;; Bug Reports : ispell-el-bugs@itcorp.com |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
12 ;; Web Site : http://kdstevens.com/~stevens/ispell-page.html |
29208 | 13 ;; Keywords: unix wp |
13337 | 14 |
14169 | 15 ;; This file is part of GNU Emacs. |
13337 | 16 |
14169 | 17 ;; GNU Emacs is free software; you can redistribute it and/or modify |
18 ;; it under the terms of the GNU General Public License as published by | |
19 ;; the Free Software Foundation; either version 2, or (at your option) | |
20 ;; any later version. | |
21 | |
22 ;; GNU Emacs is distributed in the hope that it will be useful, | |
23 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
24 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
25 ;; GNU General Public License for more details. | |
26 | |
27 ;; You should have received a copy of the GNU General Public License | |
28 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64084 | 29 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
30 ;; Boston, MA 02110-1301, USA. | |
14169 | 31 |
32 ;; 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
|
33 ;; when this file is edited for release with GNU emacs. |
14169 | 34 |
6138 | 35 ;;; Commentary: |
14169 | 36 |
37 ;; INSTRUCTIONS | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
38 |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
39 ;; 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
|
40 ;; 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
|
41 ;; 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
|
42 ;; of the users. Otherwise the users may need to set a number of variables |
14169 | 43 ;; themselves. |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
44 ;; You particularly may want to change the default dictionary for your |
14169 | 45 ;; country and language. |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
46 ;; 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
|
47 ;; enjoy them. Local or modified dictionaries are supported in your .emacs |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
48 ;; file. Use the variable `ispell-local-dictionary-alist' to specify |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
49 ;; your own dictionaries. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
50 |
14169 | 51 ;; Depending on the mail system you use, you may want to include these: |
52 ;; (add-hook 'news-inews-hook 'ispell-message) | |
53 ;; (add-hook 'mail-send-hook 'ispell-message) | |
54 ;; (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
|
55 |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
56 ;; Ispell has a TeX parser and a nroff parser (the default). |
14169 | 57 ;; The parsing is controlled by the variable ispell-parser. Currently |
58 ;; it is just a "toggle" between TeX and nroff, but if more parsers are | |
59 ;; 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
|
60 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
61 |
14169 | 62 ;; TABLE OF CONTENTS |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
63 |
14169 | 64 ;; ispell-word |
65 ;; ispell-region | |
66 ;; ispell-buffer | |
67 ;; ispell-message | |
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
68 ;; ispell-comments-and-strings |
14169 | 69 ;; ispell-continue |
70 ;; ispell-complete-word | |
71 ;; ispell-complete-word-interior-frag | |
72 ;; ispell-change-dictionary | |
73 ;; ispell-kill-ispell | |
74 ;; ispell-pdict-save | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
75 ;; ispell-skip-region-alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
76 |
14169 | 77 ;; Commands in ispell-region: |
78 ;; 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
|
79 ;; ` ': Accept word this time. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
80 ;; `i': Accept word and insert into private dictionary. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
81 ;; `a': Accept word for this session. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
82 ;; `A': Accept word and place in buffer-local dictionary. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
83 ;; `r': Replace word with typed-in value. Rechecked. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
84 ;; `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
|
85 ;; `?': Show these commands |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
86 ;; `x': Exit spelling buffer. Move cursor to original point. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
87 ;; `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
|
88 ;; the check to be completed later. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
89 ;; `q': Quit spelling session (Kills ispell process). |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
90 ;; `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
|
91 ;; `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
|
92 ;; `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
|
93 ;; `C-l': redraws screen |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
94 ;; `C-r': recursive edit |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
95 ;; `C-z': suspend emacs or iconify frame |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
96 |
14169 | 97 ;; Buffer-Local features: |
98 ;; There are a number of buffer-local features that can be used to customize | |
99 ;; ispell for the current buffer. This includes language dictionaries, | |
100 ;; personal dictionaries, parsing, and local word spellings. Each of these | |
101 ;; local customizations are done either through local variables, or by | |
102 ;; including the keyword and argument(s) at the end of the buffer (usually | |
103 ;; prefixed by the comment characters). See the end of this file for | |
104 ;; examples. The local keywords and variables are: | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
105 |
14169 | 106 ;; ispell-dictionary-keyword language-dictionary |
107 ;; uses local variable ispell-local-dictionary | |
108 ;; ispell-pdict-keyword personal-dictionary | |
109 ;; uses local variable ispell-local-pdict | |
110 ;; ispell-parsing-keyword mode-arg extended-char-arg | |
111 ;; 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
|
112 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
113 ;; Region skipping: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
114 ;; 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
|
115 ;; 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
|
116 ;; 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
|
117 ;; `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
|
118 |
14169 | 119 ;; BUGS: |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
120 ;; 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
|
121 ;; dictionary entries. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
122 ;; 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
|
123 ;; evil "misalignment error" in some versions of MULE emacs. |
14169 | 124 ;; 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
|
125 ;; see `ispell-help-in-bufferp'. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
126 ;; 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
|
127 ;; can cause misalignment errors. |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
128 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
129 ;; HISTORY |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
130 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
131 ;; Modifications made in latest versions: |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
132 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
133 ;; Revision 3.6 2003/01/07 12:32:44 kss |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
134 ;; Removed extra -d LIB in dictionary defs. (Pavel Janik) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
135 ;; Filtered process calls with duplicate dictionary entries. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
136 ;; Fixed bug where message-text-end is inside a mime skipped region. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
137 ;; Minor fixes to get ispell menus right in XEmacs |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
138 ;; Fixed skip regexp so it doesn't match stuff like `/.\w'. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
139 ;; Detecting dictionary change not working. Fixed. kss |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
140 ;; function `ispell-change-dictionary' now only completes valid dicts. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
141 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
142 ;; Revision 3.5 2001/7/11 18:43:57 kss |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
143 ;; Added fix for aspell to work in XEmacs (ispell-check-version). |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
144 ;; Added Portuguese dictionary definition. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
145 ;; New feature: MIME mail message support, Fcc support. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
146 ;; Bug fix: retain comment syntax on lines with region skipping. (TeX $ bug...) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
147 ;; Improved allocation for graphic mode lines. (Miles Bader) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
148 ;; Support -v flag for old versions of aspell. (Eli Zaretskii) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
149 ;; Clear minibuffer on ^G from ispell-help (Tak Ota) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
150 |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
151 ;; 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
|
152 ;; Support new color display functions. |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
153 ;; 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
|
154 ;; Set to standard Author/Maintainer heading, |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
155 ;; 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
|
156 ;; Added dictionary definition for Italian (William Deakin) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
157 ;; 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
|
158 ;; 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
|
159 ;; 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
|
160 ;; support for synchronous processes (Eli Zaretskii) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
161 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
162 ;; Revision 3.3 1999/11/29 11:38:34 kss |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
163 ;; Only word replacements entered in from the keyboard are rechecked. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
164 ;; This fixes a bug in tex parsing and misalignment. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
165 ;; 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
|
166 ;; condition tested. Recursive editing improved. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
167 ;; XEmacs repair for when `enable-multibyte-characters' defined - Didier Verna. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
168 ;; 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
|
169 ;; 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
|
170 ;; 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
|
171 ;; fonts. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
172 |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
173 ;; 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
|
174 ;; 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
|
175 ;; 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
|
176 ;; 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
|
177 ;; 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
|
178 ;; Removed calls to `when' macro. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
179 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
180 ;; 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
|
181 ;; Improved and fixed customize support. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
182 ;; 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
|
183 ;; 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
|
184 ;; 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
|
185 ;; Dictionary norsk7-tex removed. Dictionary polish added. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
186 ;; 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
|
187 ;; 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
|
188 ;; 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
|
189 ;; 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
|
190 ;; 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
|
191 ;; 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
|
192 ;; 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
|
193 ;; 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
|
194 ;; 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
|
195 ;; This can otherwise confuse process filters and hang ispell. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
196 ;; Improved skipping support for SGML. |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
197 ;; 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
|
198 ;; Improved message reference matching in `ispell-message'. |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
199 ;; Fixed bug in returning to nroff mode from tex mode. |
6138 | 200 |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
201 |
6138 | 202 ;;; Code: |
203 | |
65262
330e799da016
(mail-yank-prefix): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64965
diff
changeset
|
204 (defvar mail-yank-prefix) |
330e799da016
(mail-yank-prefix): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64965
diff
changeset
|
205 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
206 ;;; 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
|
207 ;;; Add in backward compatible custom support. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
208 (eval-when-compile |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
209 (if (not (fboundp 'defcustom)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
210 (defmacro defcustom (symbol value doc &rest args) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
211 "Empty replacement for defcustom when not supplied." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
212 `(defvar ,symbol ,value ,doc)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
213 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
214 (eval-when-compile |
48374
a6f9803f174f
(defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents:
46733
diff
changeset
|
215 (if (not (fboundp 'defgroup)) |
a6f9803f174f
(defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents:
46733
diff
changeset
|
216 (defmacro defgroup (&rest args) |
a6f9803f174f
(defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents:
46733
diff
changeset
|
217 "Empty replacement for defgroup when not supplied."))) |
a6f9803f174f
(defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents:
46733
diff
changeset
|
218 |
a6f9803f174f
(defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents:
46733
diff
changeset
|
219 (defgroup ispell nil |
a6f9803f174f
(defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents:
46733
diff
changeset
|
220 "User variables for emacs ispell interface." |
a6f9803f174f
(defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents:
46733
diff
changeset
|
221 :group 'applications) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
222 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
223 (if (not (fboundp 'buffer-substring-no-properties)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
224 (defun buffer-substring-no-properties (start end) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
225 (buffer-substring start end))) |
6138 | 226 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
227 (defalias 'check-ispell-version 'ispell-check-version) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
228 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
229 ;;; ********************************************************************** |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
230 ;;; 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
|
231 ;;; and location of binaries: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
232 ;;; ********************************************************************** |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
233 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
234 |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
235 ;;; ******* 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
|
236 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
237 (defcustom ispell-highlight-p 'block |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
238 "*Highlight spelling errors when non-nil. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
239 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
|
240 :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
|
241 :group 'ispell) |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
242 |
60714
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
243 (defcustom ispell-lazy-highlight (boundp 'lazy-highlight-cleanup) |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
244 "*Controls the lazy-highlighting of spelling errors. |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
245 When non-nil, all text in the buffer matching the current spelling |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
246 error is highlighted lazily using isearch lazy highlighting (see |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
247 `lazy-highlight-initial-delay' and `lazy-highlight-interval')." |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
248 :type 'boolean |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
249 :group 'lazy-highlight |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
250 :group 'ispell |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
251 :version "22.1") |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
252 |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
253 (defcustom ispell-highlight-face (if ispell-lazy-highlight 'isearch 'highlight) |
7607 | 254 "*The face used for Ispell highlighting. For Emacses with overlays. |
255 Possible values are `highlight', `modeline', `secondary-selection', | |
256 `region', and `underline'. | |
6138 | 257 This variable can be set by the user to whatever face they desire. |
258 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
|
259 slightly different." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
260 :type 'face |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
261 :group 'ispell) |
6138 | 262 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
263 (defcustom ispell-check-comments t |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
264 "*Spelling of comments checked when non-nil. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
265 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
|
266 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
|
267 may produce undesired results." |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
268 :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
|
269 :group 'ispell) |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
270 |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
271 (defcustom ispell-query-replace-choices nil |
7606 | 272 "*Corrections made throughout region when non-nil. |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
273 Uses `query-replace' (\\[query-replace]) for corrections." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
274 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
275 :group 'ispell) |
6138 | 276 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
277 (defcustom ispell-skip-tib nil |
7607 | 278 "*Does not spell check `tib' bibliography references when non-nil. |
7606 | 279 Skips any text between strings matching regular expressions |
7607 | 280 `ispell-tib-ref-beginning' and `ispell-tib-ref-end'. |
6138 | 281 |
282 TeX users beware: Any field starting with [. will skip until a .] -- even | |
7607 | 283 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
|
284 a [.5mm] type of number...." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
285 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
286 :group 'ispell) |
6138 | 287 |
288 (defvar ispell-tib-ref-beginning "[[<]\\." | |
289 "Regexp matching the beginning of a Tib reference.") | |
290 | |
291 (defvar ispell-tib-ref-end "\\.[]>]" | |
292 "Regexp matching the end of a Tib reference.") | |
293 | |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
294 (defcustom ispell-keep-choices-win t |
7607 | 295 "*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
|
296 This minimizes redisplay thrashing." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
297 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
298 :group 'ispell) |
6138 | 299 |
32685
afd8474f34ae
(ispell-mode-line-window-height-fudge):
Miles Bader <miles@gnu.org>
parents:
30954
diff
changeset
|
300 (defcustom ispell-choices-win-default-height 2 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
301 "*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
|
302 Must be greater than 1." |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
303 :type 'integer |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
304 :group 'ispell) |
6138 | 305 |
62156
12ab35f4126a
(ispell-program-name): Try looking for "aspell" along exec-path,
Eli Zaretskii <eliz@gnu.org>
parents:
60985
diff
changeset
|
306 (defcustom ispell-program-name |
12ab35f4126a
(ispell-program-name): Try looking for "aspell" along exec-path,
Eli Zaretskii <eliz@gnu.org>
parents:
60985
diff
changeset
|
307 (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p) |
12ab35f4126a
(ispell-program-name): Try looking for "aspell" along exec-path,
Eli Zaretskii <eliz@gnu.org>
parents:
60985
diff
changeset
|
308 "ispell") |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
309 "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
|
310 :type 'string |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
311 :group 'ispell) |
6138 | 312 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
313 (defcustom ispell-alternate-dictionary |
6138 | 314 (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
|
315 ((file-exists-p "/usr/share/dict/web2") "/usr/share/dict/web2") |
6138 | 316 ((file-exists-p "/usr/dict/words") "/usr/dict/words") |
317 ((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
|
318 ((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
|
319 ((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
|
320 "/usr/share/lib/dict/words") |
6138 | 321 ((file-exists-p "/sys/dict") "/sys/dict") |
322 (t "/usr/dict/words")) | |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
323 "*Alternate dictionary for spelling help." |
24795
a7afe99e73cf
(ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents:
24737
diff
changeset
|
324 :type '(choice file (const :tag "None" nil)) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
325 :group 'ispell) |
6138 | 326 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
327 (defcustom ispell-complete-word-dict ispell-alternate-dictionary |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
328 "*Dictionary used for word completion." |
24795
a7afe99e73cf
(ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents:
24737
diff
changeset
|
329 :type '(choice file (const :tag "None" nil)) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
330 :group 'ispell) |
6138 | 331 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
332 (defcustom ispell-message-dictionary-alist nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
333 "*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
|
334 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
|
335 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
|
336 DICTIONARY if `ispell-local-dictionary' is not buffer-local. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
337 E.g. you may use the following value: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
338 '((\"^Newsgroups:[ \\t]*de\\\\.\" . \"deutsch8\") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
339 (\"^To:[^\\n,]+\\\\.de[ \\t\\n,>]\" . \"deutsch8\"))" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
340 :type '(repeat (cons regexp string)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
341 :group 'ispell) |
6138 | 342 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
343 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
344 (defcustom ispell-message-fcc-skip 50000 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
345 "*Query before saving Fcc message copy if attachment larger than this value. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
346 Always stores Fcc copy of message when nil." |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
347 :type '(choice integer (const :tag "off" nil)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
348 :group 'ispell) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
349 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
350 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
351 (defcustom ispell-grep-command "egrep" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
352 "Name of the grep command for search processes." |
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) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
355 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
356 (defcustom ispell-grep-options "-i" |
7607 | 357 "String of options to use when running the program in `ispell-grep-command'. |
6138 | 358 Should probably be \"-i\" or \"-e\". |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
359 Some machines (like the NeXT) don't support \"-i\"" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
360 :type 'string |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
361 :group 'ispell) |
6138 | 362 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
363 (defcustom ispell-look-command |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
364 (cond ((file-exists-p "/bin/look") "/bin/look") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
365 ((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
|
366 ((file-exists-p "/usr/bin/look") "/usr/bin/look") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
367 (t "look")) |
6138 | 368 "Name of the look command for search processes. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
369 This must be an absolute file name." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
370 :type 'file |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
371 :group 'ispell) |
6138 | 372 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
373 (defcustom ispell-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
|
374 "*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
|
375 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
|
376 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
377 :group 'ispell) |
6138 | 378 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
379 (defcustom ispell-have-new-look nil |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
380 "*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
|
381 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
382 :group 'ispell) |
6138 | 383 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
384 (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
|
385 "String of command options for `ispell-look-command'." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
386 :type 'string |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
387 :group 'ispell) |
6138 | 388 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
389 (defcustom ispell-use-ptys-p nil |
7607 | 390 "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
|
391 When nil, Emacs uses pipes." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
392 :type 'boolean |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
393 :group 'ispell) |
6138 | 394 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
395 (defcustom ispell-following-word nil |
7607 | 396 "*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
|
397 Otherwise `ispell-word' checks the preceding word." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
398 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
399 :group 'ispell) |
6138 | 400 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
401 (defcustom ispell-help-in-bufferp nil |
7607 | 402 "*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
|
403 The following values are supported: |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
404 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
|
405 there for a couple of seconds. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
406 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
|
407 for a couple of seconds. |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
408 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
|
409 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
|
410 :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
|
411 :group 'ispell) |
6138 | 412 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
413 (defcustom ispell-quietly nil |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
414 "*Non-nil means suppress messages in `ispell-word'." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
415 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
416 :group 'ispell) |
6138 | 417 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
418 (defcustom ispell-format-word (function upcase) |
7606 | 419 "*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
|
420 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
|
421 :type 'function |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
422 :group 'ispell) |
6138 | 423 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
424 (defcustom ispell-use-framepop-p nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
425 "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
|
426 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
|
427 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
|
428 (and window-system (condition-case () (require 'framepop) (error nil)))" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
429 :type 'boolean |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
430 :group 'ispell) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
431 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
432 ;;;###autoload |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
433 (defcustom ispell-personal-dictionary nil |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
434 "*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
|
435 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
|
436 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
|
437 :type '(choice file |
fa6f38bb8ac1
(ispell-personal-dictionary): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19785
diff
changeset
|
438 (const :tag "default" nil)) |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
439 :group 'ispell) |
6138 | 440 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
441 (defcustom ispell-silently-savep nil |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
442 "*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
|
443 :type 'boolean |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
444 :group 'ispell) |
6138 | 445 |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
446 (defvar ispell-local-dictionary-overridden nil |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
447 "Non-nil means the user has explicitly set this buffer's Ispell dictionary.") |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
448 (make-variable-buffer-local 'ispell-local-dictionary) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
449 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
450 (defcustom ispell-local-dictionary nil |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
451 "If non-nil, the dictionary to be used for Ispell commands in this buffer. |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
452 The value must be a string dictionary name, |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
453 or nil, which means use the global setting in `ispell-dictionary'. |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
454 Dictionary names are defined in `ispell-local-dictionary-alist' |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
455 and `ispell-dictionary-alist', |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
456 |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
457 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
|
458 calling \\[ispell-change-dictionary] with that value. This variable |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
459 is automatically set when defined in the file with either |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
460 `ispell-dictionary-keyword' or the Local Variable syntax." |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
461 :type '(choice string |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
462 (const :tag "default" nil)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
463 :group 'ispell) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
464 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
465 (make-variable-buffer-local 'ispell-local-dictionary) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
466 |
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
467 (defcustom ispell-extra-args nil |
7607 | 468 "*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
|
469 For example, (\"-W\" \"3\") to cause it to accept all 1-3 character |
7606 | 470 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
|
471 for language-specific arguments." |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
472 :type '(repeat string) |
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
473 :group 'ispell) |
7606 | 474 |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
475 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
476 |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
477 (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
|
478 "*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
|
479 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
|
480 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
|
481 buffer's major mode." |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
482 :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
|
483 (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
|
484 :group 'ispell) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
485 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
486 (make-variable-buffer-local 'ispell-skip-html) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
487 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
488 |
24737
4a18ef61578d
(ispell-local-dictionary-alist): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents:
24701
diff
changeset
|
489 ;;;###autoload |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
490 (defcustom ispell-local-dictionary-alist nil |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
491 "*List of local or customized dictionary definitions. |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
492 These can override the values in `ispell-dictionary-alist'. |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
493 |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
494 To make permanent changes to your dictionary definitions, you |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
495 will need to make your changes in this variable, save, and then |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
496 re-start emacs." |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
497 :type '(repeat (list (choice :tag "Dictionary" |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
498 (string :tag "Dictionary name") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
499 (const :tag "default" nil)) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
500 (regexp :tag "Case characters") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
501 (regexp :tag "Non case characters") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
502 (regexp :tag "Other characters") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
503 (boolean :tag "Many other characters") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
504 (repeat :tag "Ispell command line args" |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
505 (string :tag "Arg")) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
506 (choice :tag "Extended character mode" |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
507 (const "~tex") (const "~plaintex") |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
508 (const "~nroff") (const "~list") |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
509 (const "~latin1") (const "~latin3") |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
510 (const :tag "default" nil)) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
511 (choice :tag "Coding system" |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
512 (const iso-8859-1) |
24942
517194c6cdc6
(ispell-dictionary-alist-6): Change charset for Russian.
Richard M. Stallman <rms@gnu.org>
parents:
24795
diff
changeset
|
513 (const iso-8859-2) |
55605
776d61afa493
(ispell-local-dictionary-alist): Add
Eli Zaretskii <eliz@gnu.org>
parents:
55514
diff
changeset
|
514 (const koi8-r) |
55623
4e368ca1bd3e
Fix last change in ispell.el.
Eli Zaretskii <eliz@gnu.org>
parents:
55605
diff
changeset
|
515 (const windows-1251)))) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
516 :group 'ispell) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
517 |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
518 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
519 ;;; 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
|
520 |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
521 ;;; 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
|
522 ;;;###autoload |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
523 (setq |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
524 ispell-dictionary-alist-1 |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
525 '((nil ; default (English.aff) |
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) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
527 ("american" ; Yankee English |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
528 "[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
|
529 ("brasileiro" ; Brazilian mode |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
530 "[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
|
531 "[^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]" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
532 "[']" nil nil nil iso-8859-1) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
533 ("british" ; British version |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
534 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
535 ("castellano" ; Spanish mode |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
536 "[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
|
537 "[^A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
538 "[-]" nil ("-B") "~tex" iso-8859-1) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
539 ("castellano8" ; 8 bit Spanish mode |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
540 "[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
|
541 "[^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
|
542 "[-]" 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
|
543 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
544 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
545 ;;; 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
|
546 ;;;###autoload |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
547 (setq |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
548 ispell-dictionary-alist-2 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
549 '(("czech" |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
550 "[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
|
551 "[^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]" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
552 "" nil ("-B") nil iso-8859-2) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
553 ("dansk" ; Dansk.aff |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
554 "[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
|
555 "[']" nil ("-C") nil iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
556 ("deutsch" ; Deutsch.aff |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
557 "[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
|
558 ("deutsch8" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
559 "[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
|
560 "[^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
|
561 "[']" 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
|
562 ("english" ; make English explicitly selectable |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
563 "[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
|
564 |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
565 |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
566 ;;; 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
|
567 ;;;###autoload |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
568 (setq |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
569 ispell-dictionary-alist-3 |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
570 '(("esperanto" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
571 "[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
|
572 "[^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
|
573 "[-']" t ("-C") "~latin3" iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
574 ("esperanto-tex" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
575 "[A-Za-z^\\]" "[^A-Za-z^\\]" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
576 "[-'`\"]" 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
|
577 ("francais7" |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
578 "[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
|
579 ("francais" ; Francais.aff |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
580 "[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
|
581 "[^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]" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
582 "[-']" t nil "~list" iso-8859-1) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
583 ("francais-tex" ; Francais.aff |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
584 "[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\\]" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
585 "[^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\\]" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
586 "[-'^`\"]" t nil "~tex" 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 ;;; 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
|
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-4 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
593 '(("german" ; german.aff |
39186
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
594 "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
595 ("german8" ; german.aff |
39186
44a2e1c9db0c
(ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents:
38644
diff
changeset
|
596 "[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
|
597 "[^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
|
598 "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
599 ("italiano" ; Italian.aff |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
600 "[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
|
601 "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
602 "[-]" nil ("-B" "-d" "italian") "~tex" iso-8859-1) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
603 ("nederlands" ; Nederlands.aff |
59723
08c7f3c89c0b
(ispell-dictionary-alist-4): Rewrite the CASECHARS and NOT-CASECHARS
Lute Kamstra <lute@gnu.org>
parents:
59627
diff
changeset
|
604 "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" |
08c7f3c89c0b
(ispell-dictionary-alist-4): Rewrite the CASECHARS and NOT-CASECHARS
Lute Kamstra <lute@gnu.org>
parents:
59627
diff
changeset
|
605 "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
606 "[']" t ("-C") nil iso-8859-1) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
607 ("nederlands8" ; Dutch8.aff |
59723
08c7f3c89c0b
(ispell-dictionary-alist-4): Rewrite the CASECHARS and NOT-CASECHARS
Lute Kamstra <lute@gnu.org>
parents:
59627
diff
changeset
|
608 "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" |
08c7f3c89c0b
(ispell-dictionary-alist-4): Rewrite the CASECHARS and NOT-CASECHARS
Lute Kamstra <lute@gnu.org>
parents:
59627
diff
changeset
|
609 "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
610 "[']" t ("-C") nil iso-8859-1))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
611 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
612 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
613 ;;; Fifth part of dictionary, shortened for loaddefs.el |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
614 ;;;###autoload |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
615 (setq |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
616 ispell-dictionary-alist-5 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
617 '(("norsk" ; 8 bit Norwegian mode |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
618 "[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
|
619 "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
620 "[\"]" nil nil "~list" iso-8859-1) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
621 ("norsk7-tex" ; 7 bit Norwegian TeX mode |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
622 "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
623 "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
624 ("polish" ; Polish mode |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
625 "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
626 "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
627 "" nil nil nil iso-8859-2) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
628 ("portugues" ; Portuguese mode |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
629 "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
630 "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
631 "[']" t ("-C") "~latin1" iso-8859-1))) |
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
632 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
633 |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
634 ;;; 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
|
635 ;;;###autoload |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
636 (setq |
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
637 ispell-dictionary-alist-6 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
638 ;; include Russian iso coding system too? |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
639 ;; "[']" t ("-d" "russian") "~latin1" iso-8859-1 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
640 '(("russian" ; Russian.aff (KOI8-R charset) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
641 "[\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
|
642 "[^\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]" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
643 "" nil nil nil koi8-r) |
55605
776d61afa493
(ispell-local-dictionary-alist): Add
Eli Zaretskii <eliz@gnu.org>
parents:
55514
diff
changeset
|
644 ("russianw" ; russianw.aff (CP1251 charset) |
776d61afa493
(ispell-local-dictionary-alist): Add
Eli Zaretskii <eliz@gnu.org>
parents:
55514
diff
changeset
|
645 "[\300\301\302\303\304\305\250\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\334\333\332\335\336\337\340\341\342\343\344\345\270\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\374\373\372\375\376\377]" |
776d61afa493
(ispell-local-dictionary-alist): Add
Eli Zaretskii <eliz@gnu.org>
parents:
55514
diff
changeset
|
646 "[^\300\301\302\303\304\305\250\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\334\333\332\335\336\337\340\341\342\343\344\345\270\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\374\373\372\375\376\377]" |
776d61afa493
(ispell-local-dictionary-alist): Add
Eli Zaretskii <eliz@gnu.org>
parents:
55514
diff
changeset
|
647 "" nil nil nil windows-1251) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
648 ("slovak" ; Slovakian |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
649 "[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]" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
650 "[^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]" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
651 "" nil ("-B") nil iso-8859-2) |
60985
e1c4e103c69f
(ispell-dictionary-alist-6): Add slovenian.
Eli Zaretskii <eliz@gnu.org>
parents:
60714
diff
changeset
|
652 ("slovenian" ; Slovenian |
e1c4e103c69f
(ispell-dictionary-alist-6): Add slovenian.
Eli Zaretskii <eliz@gnu.org>
parents:
60714
diff
changeset
|
653 "[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]" |
e1c4e103c69f
(ispell-dictionary-alist-6): Add slovenian.
Eli Zaretskii <eliz@gnu.org>
parents:
60714
diff
changeset
|
654 "[^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]" |
e1c4e103c69f
(ispell-dictionary-alist-6): Add slovenian.
Eli Zaretskii <eliz@gnu.org>
parents:
60714
diff
changeset
|
655 "" nil ("-B" "-d" "slovenian") nil iso-8859-2) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
656 ("svenska" ; Swedish mode |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
657 "[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
|
658 "[^A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
659 "[']" nil ("-C") "~list" iso-8859-1))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
660 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
661 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
662 ;;;###autoload |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
663 (defvar ispell-dictionary-alist |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
664 (append 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
|
665 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
|
666 ispell-dictionary-alist-5 ispell-dictionary-alist-6) |
6138 | 667 "An alist of dictionaries and their associated parameters. |
668 | |
669 Each element of this list is also a list: | |
670 | |
7606 | 671 \(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
|
672 ISPELL-ARGS EXTENDED-CHARACTER-MODE CHARACTER-SET\) |
6138 | 673 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
674 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
|
675 nil means the default dictionary. |
6138 | 676 |
677 CASECHARS is a regular expression of valid characters that comprise a | |
678 word. | |
679 | |
680 NOT-CASECHARS is the opposite regexp of CASECHARS. | |
681 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
682 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
|
683 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
|
684 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
|
685 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
|
686 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
|
687 \"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
|
688 \"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
|
689 If you want OTHERCHARS to be empty, use the empty string. |
6138 | 690 Hint: regexp syntax requires the hyphen to be declared first here. |
691 | |
60182
a8e43a2ba867
(ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
59907
diff
changeset
|
692 CASECHAS, NOT-CASECHARS, and OTHERCHARS must be a unibyte string |
a8e43a2ba867
(ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
59907
diff
changeset
|
693 containing bytes of CHARACTER-SET. In addition, if they contain |
a8e43a2ba867
(ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
59907
diff
changeset
|
694 a non-ASCII byte, the regular expression must be a single |
a8e43a2ba867
(ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
59907
diff
changeset
|
695 `character set' construct that doesn't specify a character range |
a8e43a2ba867
(ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
59907
diff
changeset
|
696 for non-ASCII bytes. |
a8e43a2ba867
(ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
59907
diff
changeset
|
697 |
19183
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
698 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
|
699 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
|
700 single word. |
6138 | 701 |
702 ISPELL-ARGS is a list of additional arguments passed to the ispell | |
703 subprocess. | |
704 | |
705 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
|
706 have been configured in an Ispell affix file. (For example, umlauts |
6138 | 707 can be encoded as \\\"a, a\\\", \"a, ...) Defaults are ~tex and ~nroff |
7607 | 708 in English. This has the same effect as the command-line `-T' option. |
709 The buffer Major Mode controls Ispell's parsing in tex or nroff mode, | |
6138 | 710 but the dictionary can control the extended character mode. |
711 Both defaults can be overruled in a buffer-local fashion. See | |
7607 | 712 `ispell-parsing-keyword' for details on this. |
6138 | 713 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
714 CHARACTER-SET used for languages with multibyte characters. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
715 |
6138 | 716 Note that the CASECHARS and OTHERCHARS slots of the alist should |
717 contain the same character set as casechars and otherchars in the | |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
718 LANGUAGE.aff file \(e.g., english.aff\).") |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
719 |
56932
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
720 (defvar ispell-really-aspell nil) ; Non-nil if aspell extensions should be used |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
721 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
722 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
723 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
724 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
725 ;;; ********************************************************************** |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
726 ;;; 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
|
727 ;;; ********************************************************************** |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
728 |
6138 | 729 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
730 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
731 ;;; 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
|
732 ;;; 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
|
733 (defconst ispell-required-version '(3 1 12) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
734 "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
|
735 (defvar ispell-offset -1 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
736 "Offset that maps protocol differences between ispell 3.1 versions.") |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
737 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
738 (defconst ispell-version "ispell.el 3.6 - 7-Jan-2003") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
739 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
740 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
741 (defun ispell-check-version (&optional interactivep) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
742 "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
|
743 Returns version number if called interactively. |
45585
13b4751a1413
(ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents:
43383
diff
changeset
|
744 Otherwise returns the library directory name, if that is defined." |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
745 ;; 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
|
746 ;; 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
|
747 ;; 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
|
748 ;; 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
|
749 ;; 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
|
750 ;; 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
|
751 ;; themselves on startup. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
752 (interactive "p") |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
753 (let ((case-fold-search-val case-fold-search) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
754 ;; avoid bugs when syntax of `.' changes in various default modes |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
755 (default-major-mode 'fundamental-mode) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
756 (default-directory (or (and (boundp 'temporary-file-directory) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
757 temporary-file-directory) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
758 default-directory)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
759 result status) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
760 (save-excursion |
46733
fc2f7f66ce57
(check-ispell-version): Bind default-directory
Richard M. Stallman <rms@gnu.org>
parents:
45605
diff
changeset
|
761 (let ((buf (get-buffer " *ispell-tmp*"))) |
fc2f7f66ce57
(check-ispell-version): Bind default-directory
Richard M. Stallman <rms@gnu.org>
parents:
45605
diff
changeset
|
762 (if buf (kill-buffer buf))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
763 (set-buffer (get-buffer-create " *ispell-tmp*")) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
764 (erase-buffer) |
58494
d3f27661a6ab
(ispell-check-version): If default-directory is nonexistent, use home dir.
Richard M. Stallman <rms@gnu.org>
parents:
57937
diff
changeset
|
765 (unless (file-exists-p default-directory) |
d3f27661a6ab
(ispell-check-version): If default-directory is nonexistent, use home dir.
Richard M. Stallman <rms@gnu.org>
parents:
57937
diff
changeset
|
766 (setq default-directory (expand-file-name "~/"))) |
34632 | 767 (setq status (call-process |
768 ispell-program-name nil t nil | |
769 ;; aspell doesn't accept the -vv switch. | |
770 (let ((case-fold-search | |
771 (memq system-type '(ms-dos windows-nt))) | |
772 (speller | |
773 (file-name-nondirectory ispell-program-name))) | |
774 ;; Assume anything that isn't `aspell' is Ispell. | |
775 (if (string-match "\\`aspell" speller) "-v" "-vv")))) | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
776 (goto-char (point-min)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
777 (if interactivep |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
778 ;; report version information of ispell and ispell.el |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
779 (progn |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
780 (end-of-line) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
781 (setq result (concat (buffer-substring-no-properties (point-min) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
782 (point)) |
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 ispell-version)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
785 (message result)) |
45585
13b4751a1413
(ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents:
43383
diff
changeset
|
786 ;; return library directory. |
34131
63a3259e1b50
(check-ispell-version): Don't use match-beginning
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33353
diff
changeset
|
787 (if (re-search-forward "LIBDIR = \\\"\\([^ \t\n]*\\)\\\"" nil t) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
788 (setq result (buffer-substring (match-beginning 1) (match-end 1))))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
789 (goto-char (point-min)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
790 (if (not (memq status '(0 nil))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
791 (error "%s exited with %s %s" ispell-program-name |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
792 (if (stringp status) "signal" "code") status)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
793 (setq case-fold-search t |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
794 status (re-search-forward |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
795 (concat "\\<\\(" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
796 (format "%d" (car ispell-required-version)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
797 "\\)\\.\\([0-9]*\\)\\.\\([0-9]*\\)\\>") |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
798 nil t) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
799 case-fold-search case-fold-search-val) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
800 (if (or (not status) ; major version mismatch |
63139
be61de52f953
(ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents:
62402
diff
changeset
|
801 (< (car (read-from-string (match-string-no-properties 2))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
802 (car (cdr ispell-required-version)))) ; minor version mismatch |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
803 (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
|
804 ispell-program-name (car ispell-required-version) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
805 (car (cdr ispell-required-version)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
806 (car (cdr (cdr ispell-required-version)))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
807 ;; check that it is the correct version. |
63139
be61de52f953
(ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents:
62402
diff
changeset
|
808 (if (and (= (car (read-from-string (match-string-no-properties 2))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
809 (car (cdr ispell-required-version))) |
63139
be61de52f953
(ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents:
62402
diff
changeset
|
810 (< (car (read-from-string (match-string-no-properties 3))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
811 (car (cdr (cdr ispell-required-version))))) |
56932
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
812 (setq ispell-offset 0)) |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
813 ;; Check to see if it's really aspell. |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
814 (goto-char (point-min)) |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
815 (let (case-fold-search) |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
816 (setq ispell-really-aspell |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
817 (and (search-forward "(but really Aspell " nil t) t)))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
818 (kill-buffer (current-buffer))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
819 result)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
820 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
821 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
822 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
823 ;;; 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
|
824 ;;; 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
|
825 ;;; 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
|
826 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
827 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
828 ;;;###autoload |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
829 (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
|
830 ;;; redo menu when loading ispell to get dictionary modifications |
23847 | 831 (setq ispell-menu-map nil) |
6138 | 832 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
833 ;;;###autoload |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
834 (defvar ispell-menu-xemacs nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
835 "Spelling menu for XEmacs. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
836 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
|
837 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
|
838 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
839 ;;; 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
|
840 ;;; 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
|
841 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
842 ;;; Set up dictionary |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
843 ;;;###autoload |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
844 (defvar ispell-menu-map-needed |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
845 ;; 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
|
846 (and (not ispell-menu-map) |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
847 (not (featurep 'xemacs)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
848 'reload)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
849 |
45585
13b4751a1413
(ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents:
43383
diff
changeset
|
850 (defvar ispell-library-directory (condition-case () |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
851 (ispell-check-version) |
45585
13b4751a1413
(ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents:
43383
diff
changeset
|
852 (error nil)) |
13b4751a1413
(ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents:
43383
diff
changeset
|
853 "Directory where ispell dictionaries reside.") |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
854 |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
855 (defvar ispell-process nil |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
856 "The process object for Ispell.") |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
857 |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
858 (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
|
859 (fboundp 'process-send-string) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
860 (fboundp 'accept-process-output) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
861 ;;(fboundp 'start-process) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
862 ;;(fboundp 'set-process-filter) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
863 ;;(fboundp 'process-kill-without-query) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
864 ) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
865 "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
|
866 |
64855
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
867 ;; Make ispell.el work better with aspell. |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
868 |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
869 (defvar ispell-have-aspell-dictionaries nil |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
870 "Non-nil if we have queried Aspell for dictionaries at least once.") |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
871 |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
872 (defun ispell-find-aspell-dictionaries () |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
873 "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'." |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
874 (interactive) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
875 (unless ispell-really-aspell |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
876 (error "This function only works with aspell")) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
877 (let ((dictionaries |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
878 (split-string |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
879 (with-temp-buffer |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
880 (call-process ispell-program-name nil t nil "dicts") |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
881 (buffer-string))))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
882 (setq ispell-dictionary-alist |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
883 (mapcar #'ispell-aspell-find-dictionary dictionaries)) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
884 (ispell-aspell-add-aliases) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
885 ;; Add a default entry |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
886 (let* ((english-dict (assoc "en" ispell-dictionary-alist)) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
887 (default-dict (cons nil (cdr english-dict)))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
888 (push default-dict ispell-dictionary-alist)) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
889 (setq ispell-have-aspell-dictionaries t))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
890 |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
891 (defvar ispell-aspell-data-dir nil |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
892 "Data directory of Aspell.") |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
893 |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
894 (defvar ispell-aspell-dict-dir nil |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
895 "Dictionary directory of Aspell.") |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
896 |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
897 (defun ispell-get-aspell-config-value (key) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
898 "Return value of Aspell configuration option KEY. |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
899 Assumes that value contains no whitespace." |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
900 (with-temp-buffer |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
901 (call-process ispell-program-name nil t nil "config" key) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
902 (car (split-string (buffer-string))))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
903 |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
904 (defun ispell-aspell-find-dictionary (dict-name) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
905 (let* ((lang ;; Strip out region, variant, etc. |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
906 (and (string-match "^[[:alpha:]]+" dict-name) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
907 (match-string 0 dict-name))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
908 (data-file |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
909 (concat (or ispell-aspell-data-dir |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
910 (setq ispell-aspell-data-dir |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
911 (ispell-get-aspell-config-value "data-dir"))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
912 "/" lang ".dat")) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
913 otherchars) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
914 ;; This file really should exist; there is no sensible recovery. |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
915 (with-temp-buffer |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
916 (insert-file-contents data-file) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
917 ;; There is zero or one line with special characters declarations. |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
918 (when (search-forward-regexp "^special" nil t) |
65262
330e799da016
(mail-yank-prefix): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64965
diff
changeset
|
919 (let ((specials (split-string |
64855
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
920 (buffer-substring (point) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
921 (progn (end-of-line) (point)))))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
922 ;; The line looks like: special ' -** - -** . -** : -*- |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
923 ;; -** means that this character |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
924 ;; - doesn't appear at word start |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
925 ;; * may appear in the middle of a word |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
926 ;; * may appear at word end |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
927 ;; `otherchars' is about the middle case. |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
928 (while specials |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
929 (when (eq (aref (cadr specials) 1) ?*) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
930 (push (car specials) otherchars)) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
931 (setq specials (cddr specials)))))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
932 (list dict-name |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
933 "[[:alpha:]]" |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
934 "[^[:alpha:]]" |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
935 (regexp-opt otherchars) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
936 t ; We can't tell, so set this to t |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
937 (list "-d" dict-name "--encoding=utf-8") |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
938 nil ; aspell doesn't support this |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
939 ;; Here we specify the encoding to use while communicating with |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
940 ;; aspell. This doesn't apply to command line arguments, so |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
941 ;; just don't pass words to spellcheck as arguments... |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
942 'utf-8))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
943 |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
944 (defun ispell-aspell-add-aliases () |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
945 "Find aspell's dictionary aliases and add them to `ispell-dictionary-alist'." |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
946 (let ((aliases (file-expand-wildcards |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
947 (concat (or ispell-aspell-dict-dir |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
948 (setq ispell-aspell-dict-dir |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
949 (ispell-get-aspell-config-value "dict-dir"))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
950 "/*.alias")))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
951 (dolist (alias-file aliases) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
952 (with-temp-buffer |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
953 (insert-file-contents alias-file) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
954 ;; Look for a line "add FOO.multi", extract FOO |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
955 (when (search-forward-regexp "^add \\([^.]+\\)\\.multi" nil t) |
65262
330e799da016
(mail-yank-prefix): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64965
diff
changeset
|
956 (let* ((aliasname (file-name-sans-extension |
64855
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
957 (file-name-nondirectory alias-file))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
958 (already-exists-p (assoc aliasname ispell-dictionary-alist)) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
959 (realname (match-string 1)) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
960 (realdict (assoc realname ispell-dictionary-alist))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
961 (when (and realdict (not already-exists-p)) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
962 (push (cons aliasname (cdr realdict)) ispell-dictionary-alist)))))))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
963 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
964 (defun ispell-valid-dictionary-list () |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
965 "Returns a list of valid dictionaries. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
966 The variable `ispell-library-directory' defines the library location." |
64855
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
967 ;; If Ispell is really Aspell, query it for the dictionary list. |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
968 (when (and (not ispell-have-aspell-dictionaries) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
969 (condition-case () |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
970 (progn (ispell-check-version) t) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
971 (error nil)) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
972 ispell-really-aspell) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
973 (ispell-find-aspell-dictionaries)) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
974 (let ((dicts (append ispell-local-dictionary-alist ispell-dictionary-alist)) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
975 (dict-list (cons "default" nil)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
976 name load-dict) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
977 (dolist (dict dicts) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
978 (setq name (car dict) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
979 load-dict (car (cdr (member "-d" (nth 5 dict))))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
980 ;; Include if the dictionary is in the library, or dir not defined. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
981 (if (and |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
982 name |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
983 ;; include all dictionaries if lib directory not known. |
64855
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
984 ;; For Aspell, we already know which dictionaries exist. |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
985 (or ispell-really-aspell |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
986 (not ispell-library-directory) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
987 (file-exists-p (concat ispell-library-directory |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
988 "/" name ".hash")) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
989 (file-exists-p (concat ispell-library-directory "/" name ".has")) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
990 (and load-dict |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
991 (or (file-exists-p (concat ispell-library-directory |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
992 "/" load-dict ".hash")) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
993 (file-exists-p (concat ispell-library-directory |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
994 "/" load-dict ".has")))))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
995 (setq dict-list (cons name dict-list)))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
996 dict-list)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
997 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
998 ;;; 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
|
999 ;;;###autoload |
45585
13b4751a1413
(ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents:
43383
diff
changeset
|
1000 (if ispell-menu-map-needed |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
1001 (progn |
64855
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
1002 (setq ispell-menu-map (make-sparse-keymap "Spell")) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
1003 (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
|
1004 '(menu-item "Change Dictionary..." ispell-change-dictionary |
45585
13b4751a1413
(ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents:
43383
diff
changeset
|
1005 :help "Supply explicit dictionary file name")) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
1006 (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
|
1007 '(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
|
1008 :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
|
1009 (eq (ispell-process-status) 'run)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1010 :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
|
1011 (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
|
1012 '(menu-item "Save Dictionary" |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1013 (lambda () (interactive) (ispell-pdict-save t t)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1014 :help "Save personal dictionary")) |
43383
d21a74d23497
2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
42889
diff
changeset
|
1015 (define-key ispell-menu-map [ispell-customize] |
d21a74d23497
2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
42889
diff
changeset
|
1016 '(menu-item "Customize..." |
d21a74d23497
2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
42889
diff
changeset
|
1017 (lambda () (interactive) (customize-group 'ispell)) |
d21a74d23497
2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
42889
diff
changeset
|
1018 :help "Customize spell checking options")) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1019 (define-key ispell-menu-map [ispell-help] |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1020 ;; 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
|
1021 '(menu-item "Help" |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1022 (lambda () (interactive) (describe-function 'ispell-help)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1023 :help "Show standard Ispell keybindings and commands")) |
43383
d21a74d23497
2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
42889
diff
changeset
|
1024 (define-key ispell-menu-map [flyspell-mode] |
d21a74d23497
2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
42889
diff
changeset
|
1025 '(menu-item "Automatic spell checking (Flyspell)" |
d21a74d23497
2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
42889
diff
changeset
|
1026 flyspell-mode |
d21a74d23497
2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
42889
diff
changeset
|
1027 :help "Check spelling while you edit the text" |
63166
5ccb3fdd9847
(ispell-menu-map-needed): flyspell-mode could be void.
Lute Kamstra <lute@gnu.org>
parents:
63139
diff
changeset
|
1028 :button (:toggle . (bound-and-true-p flyspell-mode)))) |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
1029 (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
|
1030 '(menu-item "Complete Word" ispell-complete-word |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1031 :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
|
1032 (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
|
1033 '(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
|
1034 :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
|
1035 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
1036 ;;;###autoload |
45585
13b4751a1413
(ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents:
43383
diff
changeset
|
1037 (if ispell-menu-map-needed |
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
1038 (progn |
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
1039 (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
|
1040 '(menu-item "Continue Spell-Checking" ispell-continue |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1041 :enable (and (boundp 'ispell-region-end) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1042 (marker-position ispell-region-end) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1043 (equal (marker-buffer ispell-region-end) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1044 (current-buffer))) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1045 :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
|
1046 (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
|
1047 '(menu-item "Spell-Check Word" ispell-word |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1048 :help "Spell-check word at cursor")) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1049 (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
|
1050 '(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
|
1051 :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
|
1052 |
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
1053 ;;;###autoload |
45585
13b4751a1413
(ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents:
43383
diff
changeset
|
1054 (if ispell-menu-map-needed |
8725
e4e6dc1e1be8
Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents:
8676
diff
changeset
|
1055 (progn |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1056 (define-key ispell-menu-map [ispell-region] |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1057 '(menu-item "Spell-Check Region" ispell-region |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1058 :enable mark-active |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1059 :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
|
1060 (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
|
1061 '(menu-item "Spell-Check Message" ispell-message |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1062 :help "Skip headers and included message text")) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1063 (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
|
1064 '(menu-item "Spell-Check Buffer" ispell-buffer |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1065 :help "Check spelling of selected buffer")) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1066 ;;(put 'ispell-region 'menu-enable 'mark-active) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1067 (fset 'ispell-menu-map (symbol-value 'ispell-menu-map)))) |
7606 | 1068 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1069 ;;; XEmacs versions 19 & 20 |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
1070 (if (and (featurep 'xemacs) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1071 (featurep 'menubar) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1072 ;;(null ispell-menu-xemacs) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1073 (not (and (boundp 'infodock-version) infodock-version))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1074 (let ((dicts (if (fboundp 'ispell-valid-dictionary-list) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1075 (reverse (ispell-valid-dictionary-list)))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1076 (current-menubar (or current-menubar default-menubar)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1077 (menu |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1078 '(["Help" (describe-function 'ispell-help) t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1079 ;;["Help" (popup-menu ispell-help-list) t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1080 ["Check Message" ispell-message t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1081 ["Check Buffer" ispell-buffer t] |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1082 ["Check Comments" ispell-comments-and-strings t] |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1083 ["Check Word" ispell-word t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1084 ["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
|
1085 ["Continue Check" ispell-continue t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1086 ["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
|
1087 ["Complete Word" ispell-complete-word t] |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1088 ["Kill Process" ispell-kill-ispell t] |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1089 ["Customize..." (customize-group 'ispell) t] |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1090 ;; flyspell-mode may not be bound... |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1091 ;;["flyspell" flyspell-mode |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1092 ;; :style toggle :selected flyspell-mode ] |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1093 "-" |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1094 ["Save Personal Dict"(ispell-pdict-save t t) t] |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1095 ["Change Dictionary" ispell-change-dictionary t]))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1096 (if (null dicts) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1097 (setq dicts (cons "default" nil))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1098 (dolist (name dicts) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1099 (setq menu (append menu |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1100 (list |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1101 (vector |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1102 (concat "Select " (capitalize name)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1103 (list 'ispell-change-dictionary name) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1104 t))))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1105 (setq ispell-menu-xemacs menu) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1106 (if current-menubar |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1107 (progn |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1108 (if (car (find-menu-item current-menubar '("Cmds"))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1109 (progn |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1110 ;; XEmacs 21.2 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1111 (delete-menu-item '("Cmds" "Spell-Check")) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1112 (add-menu '("Cmds") "Spell-Check" ispell-menu-xemacs)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1113 ;; previous |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1114 (delete-menu-item '("Edit" "Spell")) ; in case already defined |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1115 (add-menu '("Edit") "Spell" ispell-menu-xemacs)))))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1116 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1117 ;;; Allow incrementing characters as integers in XEmacs 20 |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
1118 (if (and (featurep 'xemacs) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1119 (fboundp 'int-char)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1120 (fset 'ispell-int-char 'int-char) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1121 ;; Emacs and XEmacs 19 or earlier |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1122 (fset 'ispell-int-char 'identity)) |
6138 | 1123 |
1124 | |
1125 ;;; ********************************************************************** | |
1126 | |
1127 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1128 ;;; This variable contains the current dictionary being used if the ispell |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1129 ;;; process is running. |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1130 (defvar ispell-current-dictionary nil |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1131 "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
|
1132 This is passed to the ispell process using the `-d' switch and is |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1133 used as key in `ispell-local-dictionary-alist' and `ispell-dictionary-alist'.") |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1134 |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1135 (defvar ispell-dictionary nil |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1136 "Default dictionary to use if `ispell-local-dictionary' is nil.") |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1137 |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1138 (defun ispell-decode-string (str) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1139 "Decodes multibyte character strings. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1140 Protects against bogus binding of `enable-multibyte-characters' in XEmacs." |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
1141 (if (and (or (featurep 'xemacs) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1142 (and (boundp 'enable-multibyte-characters) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1143 enable-multibyte-characters)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1144 (fboundp 'decode-coding-string) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1145 (ispell-get-coding-system)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1146 (decode-coding-string str (ispell-get-coding-system)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1147 str)) |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1148 |
59510
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1149 (put 'ispell-unified-chars-table 'char-table-extra-slots 0) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1150 |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1151 ;; Char-table that maps an Unicode character (charset: |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1152 ;; latin-iso8859-1, mule-unicode-0100-24ff, mule-unicode-2500-34ff) to |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1153 ;; a string in which all equivalent characters are listed. |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1154 |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1155 (defconst ispell-unified-chars-table |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1156 (let ((table (make-char-table 'ispell-unified-chars-table))) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1157 (map-char-table |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1158 #'(lambda (c v) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1159 (if (and v (/= c v)) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1160 (let ((unified (or (aref table v) (string v)))) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1161 (aset table v (concat unified (string c)))))) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1162 ucs-mule-8859-to-mule-unicode) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1163 table)) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1164 |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1165 ;; Return a string decoded from Nth element of the current dictionary |
59627
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
1166 ;; while splicing equivalent characters into the string. This splicing |
59510
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1167 ;; is done only if the string is a regular expression of the form |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1168 ;; "[...]" because, otherwise, splicing will result in incorrect |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1169 ;; regular expression matching. |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1170 |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1171 (defun ispell-get-decoded-string (n) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1172 (let* ((slot (or |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1173 (assoc ispell-current-dictionary ispell-local-dictionary-alist) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1174 (assoc ispell-current-dictionary ispell-dictionary-alist))) |
59510
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1175 (str (nth n slot))) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1176 (when (and (> (length str) 0) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1177 (not (multibyte-string-p str))) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1178 (setq str (ispell-decode-string str)) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1179 (if (and (= (aref str 0) ?\[) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1180 (eq (string-match "\\]" str) (1- (length str)))) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1181 (setq str |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1182 (string-as-multibyte |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1183 (mapconcat |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1184 #'(lambda (c) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1185 (let ((unichar (aref ucs-mule-8859-to-mule-unicode c))) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1186 (if unichar |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1187 (aref ispell-unified-chars-table unichar) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1188 (string c)))) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1189 str "")))) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1190 (setcar (nthcdr n slot) str)) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1191 str)) |
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1192 |
6138 | 1193 (defun ispell-get-casechars () |
59510
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1194 (ispell-get-decoded-string 1)) |
6138 | 1195 (defun ispell-get-not-casechars () |
59510
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1196 (ispell-get-decoded-string 2)) |
6138 | 1197 (defun ispell-get-otherchars () |
59510
13bdf84b5df8
(ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
59064
diff
changeset
|
1198 (ispell-get-decoded-string 3)) |
6138 | 1199 (defun ispell-get-many-otherchars-p () |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1200 (nth 4 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1201 (assoc ispell-current-dictionary ispell-dictionary-alist)))) |
6138 | 1202 (defun ispell-get-ispell-args () |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1203 (nth 5 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1204 (assoc ispell-current-dictionary ispell-dictionary-alist)))) |
6138 | 1205 (defun ispell-get-extended-character-mode () |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1206 (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1207 (assoc ispell-current-dictionary ispell-dictionary-alist)))) |
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1208 (defun ispell-get-coding-system () |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1209 (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1210 (assoc ispell-current-dictionary ispell-dictionary-alist)))) |
6138 | 1211 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1212 |
6138 | 1213 (defvar ispell-pdict-modified-p nil |
7607 | 1214 "Non-nil means personal dictionary has modifications to be saved.") |
6138 | 1215 |
1216 ;;; 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
|
1217 ;;; When non-nil, the spell session is terminated. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1218 ;;; When numeric, contains cursor location in buffer, and cursor remains there. |
7607 | 1219 (defvar ispell-quit nil) |
6138 | 1220 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1221 (defvar ispell-process-directory nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1222 "The directory where `ispell-process' was started.") |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1223 |
6138 | 1224 (defvar ispell-filter nil |
7607 | 1225 "Output filter from piped calls to Ispell.") |
6138 | 1226 |
1227 (defvar ispell-filter-continue nil | |
7607 | 1228 "Control variable for Ispell filter function.") |
6138 | 1229 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1230 (defvar ispell-output-buffer nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1231 "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
|
1232 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1233 (defvar ispell-session-buffer nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1234 "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
|
1235 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1236 (defvar ispell-cmd-args nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1237 "Command-line arguments to pass to a synchronous Ispell subprocess.") |
6138 | 1238 |
1239 (defvar ispell-query-replace-marker (make-marker) | |
7607 | 1240 "Marker for `query-replace' processing.") |
6138 | 1241 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1242 (defvar ispell-recursive-edit-marker (make-marker) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1243 "Marker for return point from recursive edit.") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1244 |
6138 | 1245 (defvar ispell-checking-message nil |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1246 "Non-nil when we're checking a mail message. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1247 Set to the MIME boundary locations when checking messages.") |
6138 | 1248 |
1249 (defconst ispell-choices-buffer "*Choices*") | |
1250 | |
7607 | 1251 (defvar ispell-overlay nil "Overlay variable for Ispell highlighting.") |
6138 | 1252 |
1253 ;;; *** Buffer Local Definitions *** | |
1254 | |
49599
5ade352e8d1c
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49535
diff
changeset
|
1255 (defconst ispell-words-keyword "LocalWords: " |
6138 | 1256 "The keyword for local oddly-spelled words to accept. |
1257 The keyword will be followed by any number of local word spellings. | |
1258 There can be multiple of these keywords in the file.") | |
1259 | |
1260 (defconst ispell-dictionary-keyword "Local IspellDict: " | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1261 "The keyword for a local dictionary to use. |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1262 The keyword must be followed by a valid dictionary name, defined in |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1263 `ispell-local-dictionary-alist' or `ispell-dictionary-alist'. |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1264 When multiple occurrences exist, the last keyword |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1265 definition is used.") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1266 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1267 (defconst ispell-pdict-keyword "Local IspellPersDict: " |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1268 "The keyword for defining buffer local dictionaries. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1269 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
|
1270 The last occurring definition in the buffer will be used.") |
6138 | 1271 |
1272 (defconst ispell-parsing-keyword "Local IspellParsing: " | |
7607 | 1273 "The keyword for overriding default Ispell parsing. |
6138 | 1274 The above keyword string should be followed by `latex-mode' or |
1275 `nroff-mode' to put the current buffer into the desired parsing mode. | |
1276 | |
1277 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
|
1278 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
|
1279 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
|
1280 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1281 ;;;###autoload |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1282 (defvar ispell-skip-region-alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1283 '((ispell-words-keyword forward-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1284 (ispell-dictionary-keyword forward-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1285 (ispell-pdict-keyword forward-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1286 (ispell-parsing-keyword forward-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1287 ("^---*BEGIN PGP [A-Z ]*--*" . "^---*END PGP [A-Z ]*--*") |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1288 ;; assume multiline uuencoded file? "\nM.*$"? |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1289 ("^begin [0-9][0-9][0-9] [^ \t]+$" . "\nend\n") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1290 ("^%!PS-Adobe-[123].0" . "\n%%EOF\n") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1291 ("^---* \\(Start of \\)?[Ff]orwarded [Mm]essage" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1292 . "^---* End of [Ff]orwarded [Mm]essage") |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1293 ;; 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
|
1294 ;; pattern necessary for performance reasons when `-' part of word syntax. |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1295 ("\\(--+\\|\\(/\\w\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1296 ;; above checks /.\w sequences |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1297 ;;("\\(--+\\|\\(/\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)") |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1298 ;; 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
|
1299 ;; "\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+" |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1300 ;; 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
|
1301 ;; 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
|
1302 ;; 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
|
1303 ;; 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
|
1304 ;; "\\(\\w\\|[-_]\\)+[.:@]\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+" |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1305 ) |
22529 | 1306 "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
|
1307 The alist key must be a regular expression. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1308 Valid forms include: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1309 (KEY) - just skip the key. |
22529 | 1310 (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
|
1311 (KEY REGEXP) - skip to end of REGEXP. REGEXP must be a string. |
22529 | 1312 (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
|
1313 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1314 |
6138 | 1315 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1316 ;;;###autoload |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1317 (defvar ispell-tex-skip-alists |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1318 '((;;("%\\[" . "%\\]") ; AMStex block comment... |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1319 ;; 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
|
1320 ;; \cite, \hspace, \hspace*, \hyphenation, \include, \includeonly, \input, |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1321 ;; \label, \nocite, \rule (in ispell - rest included here) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1322 ("\\\\addcontentsline" ispell-tex-arg-end 2) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1323 ("\\\\add\\(tocontents\\|vspace\\)" ispell-tex-arg-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1324 ("\\\\\\([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
|
1325 ;;("\\\\author" ispell-tex-arg-end) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1326 ("\\\\bibliographystyle" ispell-tex-arg-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1327 ("\\\\makebox" ispell-tex-arg-end 0) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1328 ("\\\\e?psfig" ispell-tex-arg-end) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1329 ("\\\\document\\(class\\|style\\)" . |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1330 "\\\\begin[ \t\n]*{[ \t\n]*document[ \t\n]*}")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1331 (;; delimited with \begin. In ispell: displaymath, eqnarray, eqnarray*, |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1332 ;; equation, minipage, picture, tabular, tabular* (ispell) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1333 ("\\(figure\\|table\\)\\*?" ispell-tex-arg-end 0) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1334 ("list" ispell-tex-arg-end 2) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1335 ("program" . "\\\\end[ \t\n]*{[ \t\n]*program[ \t\n]*}") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1336 ("verbatim\\*?" . "\\\\end[ \t\n]*{[ \t\n]*verbatim\\*?[ \t\n]*}"))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1337 "*Lists of regions to be skipped in TeX mode. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1338 First list is used raw. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1339 Second list has key placed inside \\begin{}. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1340 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1341 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
|
1342 for skipping in latex mode.") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1343 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1344 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1345 ;;;###autoload |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1346 (defvar ispell-html-skip-alists |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1347 '(("<[cC][oO][dD][eE]\\>[^>]*>" "</[cC][oO][dD][eE]*>") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1348 ("<[sS][cC][rR][iI][pP][tT]\\>[^>]*>" "</[sS][cC][rR][iI][pP][tT]>") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1349 ("<[aA][pP][pP][lL][eE][tT]\\>[^>]*>" "</[aA][pP][pP][lL][eE][tT]>") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1350 ("<[vV][eE][rR][bB]\\>[^>]*>" "<[vV][eE][rR][bB]\\>[^>]*>") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1351 ;;("<[tT][tT]\\>[^>]*>" "<[tT][tT]\\>[^>]*>") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1352 ("<[tT][tT]/" "/") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1353 ("<[^ \t\n>]" ">") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1354 ("&[^ \t\n;]" "[; \t\n]")) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1355 "*Lists of start and end keys to skip in HTML buffers. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1356 Same format as `ispell-skip-region-alist' |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1357 Note - substrings of other matches must come last |
56875
db0f95a55fd4
(ispell-html-skip-alists): Fix backslashes in docstring.
Juri Linkov <juri@jurta.org>
parents:
55623
diff
changeset
|
1358 (e.g. \"<[tT][tT]/\" and \"<[^ \\t\\n>]\").") |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1359 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1360 |
6138 | 1361 (defvar ispell-local-pdict ispell-personal-dictionary |
7606 | 1362 "A buffer local variable containing the current personal dictionary. |
7607 | 1363 If non-nil, the value must be a string, which is a file name. |
1364 | |
1365 If you specify a personal dictionary for the current buffer which is | |
1366 different from the current personal dictionary, the effect is similar | |
7606 | 1367 to calling \\[ispell-change-dictionary]. This variable is automatically |
7607 | 1368 set when defined in the file with either `ispell-pdict-keyword' or the |
1369 local variable syntax.") | |
6138 | 1370 |
1371 (make-variable-buffer-local 'ispell-local-pdict) | |
1372 | |
1373 (defvar ispell-buffer-local-name nil | |
1374 "Contains the buffer name if local word definitions were used. | |
1375 Ispell is then restarted because the local words could conflict.") | |
1376 | |
1377 (defvar ispell-parser 'use-mode-name | |
1378 "*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
|
1379 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
|
1380 Default parser is `nroff'. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1381 Currently the only other valid parser is `tex'. |
6138 | 1382 |
1383 You can set this variable in hooks in your init file -- eg: | |
1384 | |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
1385 \(add-hook 'tex-mode-hook (lambda () (setq ispell-parser 'tex)))") |
6138 | 1386 |
1387 (defvar ispell-region-end (make-marker) | |
1388 "Marker that allows spelling continuations.") | |
1389 | |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
1390 (defvar ispell-check-only nil |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
1391 "If non-nil, `ispell-word' does not try to correct the word.") |
6138 | 1392 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1393 |
6138 | 1394 ;;; ********************************************************************** |
1395 ;;; ********************************************************************** | |
1396 | |
1397 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1398 |
52103
1ffb07fde6de
Don't redo key bindings on loading, put them only in loaddefs.el.
Andreas Schwab <schwab@suse.de>
parents:
51151
diff
changeset
|
1399 ;;;###autoload (define-key esc-map "$" 'ispell-word) |
6839 | 1400 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1401 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1402 (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
|
1403 "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
|
1404 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
|
1405 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
|
1406 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1407 (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
|
1408 (if (null ispell-process) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1409 (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
|
1410 (let ((buf ispell-output-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1411 ispell-output) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1412 (if (not (bufferp buf)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1413 (setq ispell-filter nil) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1414 (save-excursion |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1415 (set-buffer buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1416 (setq ispell-output (buffer-substring-no-properties |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1417 (point-min) (point-max)))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1418 (ispell-filter t ispell-output) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1419 (save-excursion |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1420 (set-buffer buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1421 (erase-buffer))))))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1422 |
56932
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
1423 (defun ispell-send-replacement (misspelled replacement) |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
1424 "Notify aspell that MISSPELLED should be spelled REPLACEMENT. |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
1425 This allows it to improve the suggestion list based on actual mispellings." |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
1426 (and ispell-really-aspell |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
1427 (ispell-send-string (concat "$$ra " misspelled "," replacement "\n")))) |
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
1428 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1429 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1430 (defun ispell-send-string (string) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1431 "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
|
1432 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1433 (process-send-string ispell-process string) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1434 ;; 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
|
1435 ;; 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
|
1436 ;; 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
|
1437 ;; 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
|
1438 ;; 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
|
1439 (let ((cmd (aref string 0)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1440 ;; The following commands are not passed to Ispell until |
49085
18b672f173d2
(lookup-words): Cope with null lookup-dict.
Dave Love <fx@gnu.org>
parents:
48622
diff
changeset
|
1441 ;; we have a *real* reason to invoke it. |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1442 (cmds-to-defer '(?* ?@ ?~ ?+ ?- ?! ?%)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1443 (default-major-mode 'fundamental-mode) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1444 (session-buf ispell-session-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1445 (output-buf ispell-output-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1446 (ispell-args ispell-cmd-args) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1447 (defdir ispell-process-directory) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1448 prev-pos) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1449 (save-excursion |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1450 (set-buffer session-buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1451 (setq prev-pos (point)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1452 (setq default-directory defdir) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1453 (insert string) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1454 (if (not (memq cmd cmds-to-defer)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1455 (let (coding-system-for-read coding-system-for-write status) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1456 (if (and (boundp 'enable-multibyte-characters) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1457 enable-multibyte-characters) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1458 (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
|
1459 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
|
1460 (set-buffer output-buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1461 (erase-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1462 (set-buffer session-buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1463 (setq status |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1464 (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
|
1465 ispell-program-name nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1466 output-buf nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1467 "-a" "-m" ispell-args)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1468 (set-buffer output-buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1469 (goto-char (point-min)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1470 (save-match-data |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1471 (if (not (looking-at "@(#) ")) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1472 (error "Ispell error: %s" |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1473 (buffer-substring-no-properties |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1474 (point) (progn (end-of-line) (point))))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1475 ;; 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
|
1476 ;; 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
|
1477 ;; 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
|
1478 ;; `ispell-filter'. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1479 (or (string= string "\032\n") |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1480 (progn |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1481 (forward-line) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1482 (delete-region (point-min) (point)))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1483 ;; 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
|
1484 ;; 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
|
1485 ;; 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
|
1486 ;; 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
|
1487 ;; the personal dictionary. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1488 (set-buffer session-buf) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1489 (delete-region prev-pos (point)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1490 ;; Ispell run synchronously saves the personal dictionary |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1491 ;; 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
|
1492 ;; 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
|
1493 ;; dictionary. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1494 (if (memq status '(0 nil)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1495 (let ((more-lines t)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1496 (goto-char (point-min)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1497 (while more-lines |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1498 (if (looking-at "^\\*") |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1499 (let ((start (point))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1500 (forward-line) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1501 (delete-region start (point))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1502 (setq more-lines (= 0 (forward-line)))))))))))))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1503 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1504 |
60530
32fd45514893
(ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents:
60284
diff
changeset
|
1505 ;; Insert WORD while translating Latin characters to the equivalent |
32fd45514893
(ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents:
60284
diff
changeset
|
1506 ;; characters that is supported by buffer-file-coding-system. |
32fd45514893
(ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents:
60284
diff
changeset
|
1507 |
32fd45514893
(ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents:
60284
diff
changeset
|
1508 (defun ispell-insert-word (word) |
32fd45514893
(ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents:
60284
diff
changeset
|
1509 (let ((pos (point))) |
32fd45514893
(ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents:
60284
diff
changeset
|
1510 (insert word) |
32fd45514893
(ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents:
60284
diff
changeset
|
1511 (if (char-table-p translation-table-for-input) |
32fd45514893
(ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents:
60284
diff
changeset
|
1512 (translate-region pos (point) translation-table-for-input)))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1513 |
6138 | 1514 ;;;###autoload |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1515 (defun ispell-word (&optional following quietly continue) |
6138 | 1516 "Check spelling of word under or before the cursor. |
7607 | 1517 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
|
1518 in a window allowing you to choose one. |
7607 | 1519 |
7606 | 1520 If optional argument FOLLOWING is non-nil or if `ispell-following-word' |
6138 | 1521 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
|
1522 \(rather than preceding\) is checked when the cursor is not over a word. |
7606 | 1523 When the optional argument QUIETLY is non-nil or `ispell-quietly' is non-nil |
6138 | 1524 when called interactively, non-corrective messages are suppressed. |
1525 | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1526 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
|
1527 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
|
1528 |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1529 Word syntax is controlled by the definition of the chosen dictionary, |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1530 which is in `ispell-local-dictionary-alist' or `ispell-dictionary-alist'. |
6138 | 1531 |
1532 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
|
1533 or \\[ispell-region] to update the Ispell process. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1534 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1535 return values: |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1536 nil word is correct or spelling is accepted. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1537 0 word is inserted into buffer-local definitions. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1538 \"word\" word corrected from word list. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1539 \(\"word\" arg\) word is hand entered. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1540 quit spell session exited." |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1541 |
57937
d4af4d8d512b
(ispell-word): Don't alter args; set them only thru `interactive' spec.
Richard M. Stallman <rms@gnu.org>
parents:
57516
diff
changeset
|
1542 (interactive (list ispell-following-word ispell-quietly current-prefix-arg)) |
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1543 (if continue |
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1544 (ispell-continue) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1545 (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
|
1546 (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
|
1547 (word (ispell-get-word following)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1548 start end poss new-word replace) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1549 ;; De-structure return word info list. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1550 (setq start (car (cdr word)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1551 end (car (cdr (cdr word))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1552 word (car word)) |
6138 | 1553 |
63816
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1554 ;; At this point it used to ignore 2-letter words. |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1555 ;; But that is silly; if the user asks for it, we should do it. - rms. |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1556 (or quietly |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1557 (message "Checking spelling of %s..." |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1558 (funcall ispell-format-word word))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1559 (ispell-send-string "%\n") ; put in verbose mode |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1560 (ispell-send-string (concat "^" word "\n")) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1561 ;; wait until ispell has processed word |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1562 (while (progn |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1563 (ispell-accept-output) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1564 (not (string= "" (car ispell-filter))))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1565 ;;(ispell-send-string "!\n") ;back to terse mode. |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1566 (setq ispell-filter (cdr ispell-filter)) ; remove extra \n |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1567 (if (and ispell-filter (listp ispell-filter)) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1568 (if (> (length ispell-filter) 1) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1569 (error "Ispell and its process have different character maps") |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1570 (setq poss (ispell-parse-output (car ispell-filter))))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1571 (cond ((eq poss t) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1572 (or quietly |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1573 (message "%s is correct" |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1574 (funcall ispell-format-word word))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1575 (and (fboundp 'extent-at) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1576 (extent-at start) |
64855
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
1577 (and (fboundp 'delete-extent) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
1578 (delete-extent (extent-at start))))) |
63816
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1579 ((stringp poss) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1580 (or quietly |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1581 (message "%s is correct because of root %s" |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1582 (funcall ispell-format-word word) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1583 (funcall ispell-format-word poss))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1584 (and (fboundp 'extent-at) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1585 (extent-at start) |
64855
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
1586 (and (fboundp 'delete-extent) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
1587 (delete-extent (extent-at start))))) |
63816
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1588 ((null poss) (message "Error in ispell process")) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1589 (ispell-check-only ; called from ispell minor mode. |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1590 (if (fboundp 'make-extent) |
64855
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
1591 (if (fboundp 'set-extent-property) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
1592 (let ((ext (make-extent start end))) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
1593 (set-extent-property ext 'face ispell-highlight-face) |
2fe6c83ec9b4
(ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents:
64751
diff
changeset
|
1594 (set-extent-property ext 'priority 2000))) |
63816
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1595 (beep) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1596 (message "%s is incorrect"(funcall ispell-format-word word)))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1597 (t ; prompt for correct word. |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1598 (save-window-excursion |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1599 (setq replace (ispell-command-loop |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1600 (car (cdr (cdr poss))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1601 (car (cdr (cdr (cdr poss)))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1602 (car poss) start end))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1603 (cond ((equal 0 replace) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1604 (ispell-add-per-file-word-list (car poss))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1605 (replace |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1606 (setq new-word (if (atom replace) replace (car replace)) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1607 cursor-location (+ (- (length word) (- end start)) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1608 cursor-location)) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1609 (if (not (equal new-word (car poss))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1610 (progn |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1611 (delete-region start end) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1612 (setq start (point)) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1613 (ispell-insert-word new-word) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1614 (setq end (point)))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1615 (if (not (atom replace)) ;recheck spelling of replacement |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1616 (progn |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1617 (if (car (cdr replace)) ; query replace requested |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1618 (save-window-excursion |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1619 (query-replace word new-word t))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1620 (goto-char start) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1621 ;; single word could be split into multiple words |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1622 (setq ispell-quit (not (ispell-region start end))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1623 )))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1624 ;; keep if rechecking word and we keep choices win. |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1625 (if (get-buffer ispell-choices-buffer) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1626 (kill-buffer ispell-choices-buffer)))) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1627 (ispell-pdict-save ispell-silently-savep) |
af4dc212b013
(ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents:
63166
diff
changeset
|
1628 ;; NB: Cancels ispell-quit incorrectly if called from ispell-region |
63822
8f7b5af86a5d
(ispell-word): Remove stray parenthesis.
Luc Teirlinck <teirllm@auburn.edu>
parents:
63816
diff
changeset
|
1629 (if ispell-quit (setq ispell-quit nil replace 'quit)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1630 (goto-char cursor-location) ; return to original location |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1631 replace))) |
6138 | 1632 |
1633 | |
1634 (defun ispell-get-word (following &optional extra-otherchars) | |
1635 "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
|
1636 If optional argument FOLLOWING is non-nil or if `ispell-following-word' |
6138 | 1637 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
|
1638 \(rather than preceding\) is checked when the cursor is not over a word. |
7606 | 1639 Optional second argument contains otherchars that can be included in word |
6138 | 1640 many times. |
1641 | |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1642 Word syntax is controlled by the definition of the chosen dictionary, |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
1643 which is in `ispell-local-dictionary-alist' or `ispell-dictionary-alist'." |
6138 | 1644 (let* ((ispell-casechars (ispell-get-casechars)) |
1645 (ispell-not-casechars (ispell-get-not-casechars)) | |
1646 (ispell-otherchars (ispell-get-otherchars)) | |
1647 (ispell-many-otherchars-p (ispell-get-many-otherchars-p)) | |
1648 (word-regexp (concat ispell-casechars | |
1649 "+\\(" | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1650 (if (not (string= "" ispell-otherchars)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1651 (concat ispell-otherchars "?")) |
6138 | 1652 (if extra-otherchars |
1653 (concat extra-otherchars "?")) | |
1654 ispell-casechars | |
1655 "+\\)" | |
1656 (if (or ispell-many-otherchars-p | |
1657 extra-otherchars) | |
1658 "*" "?"))) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1659 did-it-once prevpt |
6138 | 1660 start end word) |
1661 ;; find the word | |
1662 (if (not (looking-at ispell-casechars)) | |
1663 (if following | |
1664 (re-search-forward ispell-casechars (point-max) t) | |
1665 (re-search-backward ispell-casechars (point-min) t))) | |
1666 ;; move to front of word | |
1667 (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
|
1668 (while (and (or (and (not (string= "" ispell-otherchars)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1669 (looking-at ispell-otherchars)) |
6138 | 1670 (and extra-otherchars (looking-at extra-otherchars))) |
1671 (not (bobp)) | |
1672 (or (not did-it-once) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1673 ispell-many-otherchars-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1674 (not (eq prevpt (point)))) |
6138 | 1675 (if (and extra-otherchars (looking-at extra-otherchars)) |
1676 (progn | |
1677 (backward-char 1) | |
1678 (if (looking-at ispell-casechars) | |
1679 (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
|
1680 (setq did-it-once t |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1681 prevpt (point)) |
6138 | 1682 (backward-char 1) |
1683 (if (looking-at ispell-casechars) | |
1684 (re-search-backward ispell-not-casechars (point-min) 'move) | |
1685 (backward-char -1)))) | |
1686 ;; 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
|
1687 (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
|
1688 (if ispell-check-only |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1689 ;; 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
|
1690 (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
|
1691 (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
|
1692 (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
|
1693 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
|
1694 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
|
1695 (list word start end)))) |
6138 | 1696 |
1697 | |
1698 ;;; Global ispell-pdict-modified-p is set by ispell-command-loop and | |
1699 ;;; tracks changes in the dictionary. The global may either be | |
1700 ;;; a value or a list, whose value is the state of whether the | |
1701 ;;; dictionary needs to be saved. | |
1702 | |
37426 | 1703 ;;;###autoload |
6138 | 1704 (defun ispell-pdict-save (&optional no-query force-save) |
1705 "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
|
1706 If so, ask if it needs to be saved." |
6138 | 1707 (interactive (list ispell-silently-savep t)) |
1708 (if (and ispell-pdict-modified-p (listp ispell-pdict-modified-p)) | |
1709 (setq ispell-pdict-modified-p (car ispell-pdict-modified-p))) | |
1710 (if (or ispell-pdict-modified-p force-save) | |
1711 (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
|
1712 (progn |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1713 (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
|
1714 (message "Personal dictionary saved.")))) |
6138 | 1715 ;; unassert variable, even if not saved to avoid questioning. |
1716 (setq ispell-pdict-modified-p nil)) | |
1717 | |
1718 | |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1719 (defun ispell-command-loop (miss guess word start end) |
6138 | 1720 "Display possible corrections from list MISS. |
1721 GUESS lists possibly valid affix construction of WORD. | |
1722 Returns nil to keep word. | |
7606 | 1723 Returns 0 to insert locally into buffer-local dictionary. |
1724 Returns string for new chosen word. | |
1725 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
|
1726 Query-replace when list length is 2. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1727 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
|
1728 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
|
1729 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
|
1730 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
|
1731 used. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1732 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
|
1733 (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
|
1734 (line ispell-choices-win-default-height) |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1735 ;; ensure 4 context lines. |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1736 (max-lines (- (ispell-adjusted-window-height) 4)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1737 (choices miss) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1738 (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
|
1739 ispell-choices-win-default-height)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1740 (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
|
1741 (dedicated (window-dedicated-p (selected-window))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1742 (skipped 0) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1743 char num result textwin dedicated-win) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1744 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1745 ;; setup the *Choices* buffer with valid data. |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1746 (save-excursion |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1747 (set-buffer (get-buffer-create ispell-choices-buffer)) |
64196
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
1748 (setq mode-line-format |
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
1749 (concat "-- %b -- word: " word |
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
1750 " -- dict: " (or ispell-current-dictionary "default") |
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
1751 " -- prog: " (file-name-nondirectory ispell-program-name))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
1752 ;; XEmacs: no need for horizontal scrollbar in choices window |
57516
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
1753 (with-no-warnings |
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
1754 (and (fboundp 'set-specifier) |
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
1755 (boundp 'horizontal-scrollbar-visible-p) |
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
1756 (set-specifier horizontal-scrollbar-visible-p nil |
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
1757 (cons (current-buffer) nil)))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1758 (erase-buffer) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1759 (if guess |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1760 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1761 (insert "Affix rules generate and capitalize " |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1762 "this word as shown below:\n\t") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1763 (while guess |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1764 (if (> (+ 4 (current-column) (length (car guess))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1765 (window-width)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1766 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1767 (insert "\n\t") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1768 (setq line (1+ line)))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1769 (insert (car guess) " ") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1770 (setq guess (cdr guess))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1771 (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
|
1772 " from the derivative root.\n") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1773 (setq line (+ line (if choices 3 2))))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1774 (while (and choices |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1775 (< (if (> (+ 7 (current-column) (length (car choices)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1776 (if (> count ?~) 3 0)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1777 (window-width)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1778 (progn |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1779 (insert "\n") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1780 (setq line (1+ line))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1781 line) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1782 max-lines)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1783 ;; 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
|
1784 ;; 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
|
1785 (while (memq count command-characters) ; skip command characters. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1786 (setq count (ispell-int-char (1+ count)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1787 skipped (1+ skipped))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1788 (insert "(" count ") " (car choices) " ") |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1789 (setq choices (cdr choices) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1790 count (ispell-int-char (1+ count)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1791 (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
|
1792 |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1793 ;; ensure word is visible |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1794 (if (not (pos-visible-in-window-p end)) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1795 (sit-for 0)) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1796 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1797 ;; allow temporary split of dedicated windows... |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1798 (if dedicated |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1799 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1800 (setq dedicated-win (selected-window)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1801 (set-window-dedicated-p dedicated-win nil))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1802 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1803 ;; Display choices for misspelled word. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1804 (ispell-show-choices line end) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1805 (select-window (setq textwin (next-window))) |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1806 |
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1807 ;; highlight word, protecting current buffer status |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1808 (unwind-protect |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1809 (progn |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1810 (and ispell-highlight-p |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1811 (ispell-highlight-spelling-error start end t)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1812 ;; Loop until a valid choice is made. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1813 (while |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1814 (eq |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1815 t |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1816 (setq |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1817 result |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1818 (progn |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1819 (undo-boundary) |
17143
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1820 (let (message-log-max) |
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1821 (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
|
1822 "unchanged, Character to replace word"))) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1823 (let ((inhibit-quit t)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1824 (setq char (if (fboundp 'read-char-exclusive) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1825 (read-char-exclusive) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1826 (read-char)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1827 skipped 0) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1828 (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
|
1829 (setq char ?X |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1830 quit-flag nil))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1831 ;; Adjust num to array offset skipping command characters. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1832 (let ((com-chars command-characters)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1833 (while com-chars |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1834 (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
|
1835 (setq skipped (1+ skipped))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1836 (setq com-chars (cdr com-chars))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1837 (setq num (- char ?0 skipped))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1838 |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1839 (cond |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1840 ((= char ? ) nil) ; accept word this time only |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1841 ((= 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
|
1842 (ispell-send-string (concat "*" word "\n")) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1843 (setq ispell-pdict-modified-p '(t)) ; dictionary modified! |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1844 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1845 ((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
|
1846 (ispell-send-string (concat "@" word "\n")) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1847 (if (null ispell-pdict-modified-p) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1848 (setq ispell-pdict-modified-p |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1849 (list ispell-pdict-modified-p))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1850 (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
|
1851 ((or (= char ?r) (= char ?R)) ; type in replacement |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1852 (and (eq 'block ispell-highlight-p) ; refresh tty's |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1853 (ispell-highlight-spelling-error start end nil t)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1854 (let ((result |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1855 (if (or (= char ?R) ispell-query-replace-choices) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1856 (list (read-string |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1857 (format "Query-replacement for %s: "word) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1858 word) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1859 t) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1860 (cons (read-string "Replacement for: " word) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1861 nil)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1862 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1863 (ispell-highlight-spelling-error start end nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1864 'block)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1865 result)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1866 ((or (= char ??) (= char help-char) (= char ?\C-h)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1867 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1868 (ispell-highlight-spelling-error start end nil t)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1869 (ispell-help) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1870 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1871 (ispell-highlight-spelling-error start end nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1872 'block)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1873 t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1874 ;; Quit and move point back. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1875 ((= char ?x) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1876 (ispell-pdict-save ispell-silently-savep) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1877 (message "Exited spell-checking") |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1878 (setq ispell-quit t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1879 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1880 ;; Quit and preserve point. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1881 ((= char ?X) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1882 (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
|
1883 (message "%s" |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1884 (substitute-command-keys |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1885 (concat "Spell-checking suspended;" |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1886 " use C-u \\[ispell-word] to resume"))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1887 (setq ispell-quit start) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1888 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1889 ((= char ?q) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1890 (if (y-or-n-p "Really kill Ispell process? ") |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1891 (progn |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1892 (ispell-kill-ispell t) ; terminate process. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1893 (setq ispell-quit (or (not ispell-checking-message) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1894 (point)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1895 ispell-pdict-modified-p nil)) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1896 t)) ; continue if they don't quit. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1897 ((= char ?l) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1898 (and (eq 'block ispell-highlight-p) ; refresh tty displays |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1899 (ispell-highlight-spelling-error start end nil t)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1900 (let ((new-word (read-string |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1901 "Lookup string (`*' is wildcard): " |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1902 word))) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1903 (if new-word |
6138 | 1904 (progn |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1905 (save-excursion |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1906 (set-buffer (get-buffer-create |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1907 ispell-choices-buffer)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1908 (erase-buffer) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1909 (setq count ?0 |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1910 skipped 0 |
64196
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
1911 mode-line-format |
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
1912 (concat "-- %b -- word: " new-word |
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
1913 " -- dict: " |
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
1914 ispell-alternate-dictionary) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1915 miss (lookup-words new-word) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1916 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
|
1917 line ispell-choices-win-default-height) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1918 (while (and choices ; adjust choices window. |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1919 (< (if (> (+ 7 (current-column) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1920 (length (car choices)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1921 (if (> count ?~) 3 0)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1922 (window-width)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1923 (progn |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1924 (insert "\n") |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1925 (setq line (1+ line))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1926 line) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1927 max-lines)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1928 (while (memq count command-characters) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1929 (setq count (ispell-int-char (1+ count)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1930 skipped (1+ skipped))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1931 (insert "(" count ") " (car choices) " ") |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1932 (setq choices (cdr choices) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1933 count (ispell-int-char (1+ count)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1934 (setq count (ispell-int-char |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1935 (- count ?0 skipped)))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1936 (ispell-show-choices line end) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1937 (select-window (next-window))))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1938 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1939 (ispell-highlight-spelling-error start end nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1940 'block)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1941 t) ; reselect from new choices |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1942 ((= char ?u) ; insert lowercase into dictionary |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1943 (ispell-send-string (concat "*" (downcase word) "\n")) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1944 (setq ispell-pdict-modified-p '(t)) ; dictionary modified! |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1945 nil) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1946 ((= 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
|
1947 (ispell-send-string |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1948 (concat "*" (read-string "Insert: " word) "\n")) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1949 (setq ispell-pdict-modified-p '(t)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1950 (cons word nil)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1951 ((and (>= num 0) (< num count)) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1952 (if ispell-query-replace-choices ; Query replace flag |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1953 (list (nth num miss) 'query-replace) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1954 (nth num miss))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1955 ((= char ?\C-l) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1956 (redraw-display) t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1957 ((= char ?\C-r) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1958 ;; 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
|
1959 (if (marker-position ispell-recursive-edit-marker) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1960 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1961 (message "Only one recursive edit session supported") |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1962 (beep) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1963 (sit-for 2)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1964 (set-marker ispell-recursive-edit-marker start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1965 ;;(set-marker ispell-region-end reg-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1966 (and ispell-highlight-p ; unhighlight |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1967 (ispell-highlight-spelling-error start end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1968 (unwind-protect |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1969 (progn |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1970 (message |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1971 "%s" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1972 (substitute-command-keys |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1973 (concat "Exit recursive edit with" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1974 " \\[exit-recursive-edit]"))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1975 (save-window-excursion (save-excursion |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1976 (recursive-edit)))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1977 ;; protected |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1978 (goto-char ispell-recursive-edit-marker) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1979 (if (not (equal (marker-buffer |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1980 ispell-recursive-edit-marker) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1981 (current-buffer))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1982 (progn |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1983 (set-marker ispell-recursive-edit-marker nil) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1984 (error |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1985 "Cannot continue ispell from this buffer."))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1986 (set-marker ispell-recursive-edit-marker nil))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1987 (list word nil)) ; recheck starting at this word. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1988 ((= char ?\C-z) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1989 (funcall (key-binding "\C-z")) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1990 t) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1991 (t (ding) t)))))) |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1992 result) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1993 ;; protected |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1994 (and ispell-highlight-p ; unhighlight |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1995 (save-window-excursion |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1996 (select-window textwin) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1997 (ispell-highlight-spelling-error start end))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1998 (if dedicated |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1999 (set-window-dedicated-p dedicated-win t))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2000 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2001 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2002 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2003 (defun ispell-show-choices (line end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2004 "Shows the choices in another buffer or frame." |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2005 (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
|
2006 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2007 (framepop-display-buffer (get-buffer ispell-choices-buffer)) |
57516
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
2008 ;;; (get-buffer-window ispell-choices-buffer t) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2009 (select-window (previous-window))) ; *Choices* window |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2010 ;; 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
|
2011 (let ((choices-window (get-buffer-window ispell-choices-buffer))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2012 (if choices-window |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2013 (if (= line (ispell-adjusted-window-height choices-window)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2014 (select-window choices-window) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2015 ;; *Choices* window changed size. Adjust the choices window |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2016 ;; without scrolling the spelled window when possible |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2017 (let ((window-line |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2018 (- line (ispell-adjusted-window-height choices-window))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2019 (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
|
2020 (if (< line ispell-choices-win-default-height) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2021 (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
|
2022 (- ispell-choices-win-default-height |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2023 line)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2024 (move-to-window-line 0) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2025 (vertical-motion window-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2026 (set-window-start (selected-window) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2027 (if (> (point) visible) visible (point))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2028 (goto-char end) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2029 (select-window choices-window) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2030 (enlarge-window window-line))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2031 ;; 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
|
2032 (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
|
2033 (switch-to-buffer ispell-choices-buffer) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2034 (goto-char (point-min))))) |
6138 | 2035 |
2036 | |
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
2037 ;;;###autoload |
6138 | 2038 (defun ispell-help () |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2039 "Display a list of the options available when a misspelling is encountered. |
6138 | 2040 |
2041 Selections are: | |
2042 | |
2043 DIGIT: Replace the word with a digit offered in the *Choices* buffer. | |
7607 | 2044 SPC: Accept word this time. |
2045 `i': Accept word and insert into private dictionary. | |
2046 `a': Accept word for this session. | |
2047 `A': Accept word and place in `buffer-local dictionary'. | |
2048 `r': Replace word with typed-in value. Rechecked. | |
2049 `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. | |
2050 `?': Show these commands. | |
2051 `x': Exit spelling buffer. Move cursor to original point. | |
2052 `X': Exit spelling buffer. Leaves cursor at the current point, and permits | |
6138 | 2053 the aborted check to be completed later. |
7607 | 2054 `q': Quit spelling session (Kills ispell process). |
2055 `l': Look up typed-in replacement in alternate dictionary. Wildcards okay. | |
2056 `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
|
2057 `m': Place typed-in value in personal dictionary, then recheck current word. |
7607 | 2058 `C-l': redraws screen |
2059 `C-r': recursive edit | |
2060 `C-z': suspend emacs or iconify frame" | |
6138 | 2061 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2062 (if (equal ispell-help-in-bufferp 'electric) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2063 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2064 (require 'ehelp) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2065 (with-electric-help |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2066 (function (lambda () |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2067 ;;This shouldn't be necessary: with-electric-help needs |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2068 ;; an optional argument telling it about the smallest |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2069 ;; acceptable window-height of the help buffer. |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2070 ;;(if (< (window-height) 15) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2071 ;; (enlarge-window |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2072 ;; (- 15 (ispell-adjusted-window-height)))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2073 (princ "Selections are: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2074 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2075 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
|
2076 SPC: Accept word this time. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2077 `i': Accept word and insert into private dictionary. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2078 `a': Accept word for this session. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2079 `A': Accept word and place in `buffer-local dictionary'. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2080 `r': Replace word with typed-in value. Rechecked. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2081 `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
|
2082 `?': Show these commands. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2083 `x': Exit spelling buffer. Move cursor to original point. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2084 `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
|
2085 the aborted check to be completed later. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2086 `q': Quit spelling session (Kills ispell process). |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2087 `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
|
2088 `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
|
2089 `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
|
2090 `C-l': redraws screen |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2091 `C-r': recursive edit |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2092 `C-z': suspend emacs or iconify frame") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2093 nil ;undocumented requirement of with-electric-help |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2094 )))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2095 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2096 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2097 (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
|
2098 "[i]nsert into private dictionary")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2099 (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
|
2100 "e[x/X]it; [q]uit session")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2101 (help-3 (concat "[u]ncapitalized insert into dict. " |
54487 | 2102 "Type 'x C-h f ispell-help' for more help"))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2103 (save-window-excursion |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2104 (if ispell-help-in-bufferp |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2105 (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
|
2106 (ispell-overlay-window 4) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2107 (switch-to-buffer (get-buffer-create "*Ispell Help*")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2108 (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
|
2109 (sit-for 5) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2110 (kill-buffer "*Ispell Help*")) |
42889
d91994a23659
(ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2111 (unwind-protect |
59064
c674f42f1748
(ispell-help): Bind resize-mini-windows.
Richard M. Stallman <rms@gnu.org>
parents:
58494
diff
changeset
|
2112 (let ((resize-mini-windows 'grow-only)) |
42889
d91994a23659
(ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2113 (select-window (minibuffer-window)) |
d91994a23659
(ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2114 (erase-buffer) |
d91994a23659
(ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2115 (message nil) |
d91994a23659
(ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2116 ;;(set-minibuffer-window (selected-window)) |
d91994a23659
(ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2117 (enlarge-window 2) |
d91994a23659
(ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2118 (insert (concat help-1 "\n" help-2 "\n" help-3)) |
d91994a23659
(ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2119 (sit-for 5)) |
d91994a23659
(ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
2120 (erase-buffer))))))) |
6138 | 2121 |
2122 | |
2123 (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
|
2124 "Look up WORD in optional word-list dictionary LOOKUP-DICT. |
7606 | 2125 A `*' serves as a wild card. If no wild cards, `look' is used if it exists. |
2126 Otherwise the variable `ispell-grep-command' contains the command used to | |
2127 search for the words (usually egrep). | |
2128 | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2129 Optional second argument contains the dictionary to use; the default is |
7606 | 2130 `ispell-alternate-dictionary'." |
6138 | 2131 ;; We don't use the filter for this function, rather the result is written |
2132 ;; into a buffer. Hence there is no need to save the filter values. | |
2133 (if (null lookup-dict) | |
2134 (setq lookup-dict ispell-alternate-dictionary)) | |
2135 | |
2136 (let* ((process-connection-type ispell-use-ptys-p) | |
2137 (wild-p (string-match "\\*" word)) | |
2138 (look-p (and ispell-look-p ; Only use look for an exact match. | |
2139 (or ispell-have-new-look (not wild-p)))) | |
2140 (ispell-grep-buffer (get-buffer-create "*Ispell-Temp*")) ; result buf | |
2141 (prog (if look-p ispell-look-command ispell-grep-command)) | |
2142 (args (if look-p ispell-look-options ispell-grep-options)) | |
2143 status results loc) | |
2144 (unwind-protect | |
2145 (save-window-excursion | |
2146 (message "Starting \"%s\" process..." (file-name-nondirectory prog)) | |
2147 (set-buffer ispell-grep-buffer) | |
2148 (if look-p | |
2149 nil | |
2150 ;; convert * to .* | |
2151 (insert "^" word "$") | |
2152 (while (search-backward "*" nil t) (insert ".")) | |
2153 (setq word (buffer-string)) | |
2154 (erase-buffer)) | |
64965
008b8c9ce315
(lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents:
64855
diff
changeset
|
2155 (setq status (apply 'call-process prog nil t nil |
008b8c9ce315
(lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents:
64855
diff
changeset
|
2156 (nconc (if (and args (> (length args) 0)) |
008b8c9ce315
(lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents:
64855
diff
changeset
|
2157 (list args) |
008b8c9ce315
(lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents:
64855
diff
changeset
|
2158 (if look-p nil |
008b8c9ce315
(lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents:
64855
diff
changeset
|
2159 (list "-e"))) |
008b8c9ce315
(lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents:
64855
diff
changeset
|
2160 (list word) |
008b8c9ce315
(lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents:
64855
diff
changeset
|
2161 (if lookup-dict (list lookup-dict))))) |
6138 | 2162 ;; grep returns status 1 and no output when word not found, which |
2163 ;; is a perfectly normal thing. | |
2164 (if (stringp status) | |
2165 (setq results (cons (format "error: %s exited with signal %s" | |
2166 (file-name-nondirectory prog) status) | |
2167 results)) | |
2168 ;; else collect words into `results' in FIFO order | |
2169 (goto-char (point-max)) | |
2170 ;; assure we've ended with \n | |
2171 (or (bobp) (= (preceding-char) ?\n) (insert ?\n)) | |
2172 (while (not (bobp)) | |
2173 (setq loc (point)) | |
2174 (forward-line -1) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2175 (setq results (cons (buffer-substring-no-properties (point) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2176 (1- loc)) |
6138 | 2177 results))))) |
2178 ;; protected | |
2179 (kill-buffer ispell-grep-buffer) | |
2180 (if (and results (string-match ".+: " (car results))) | |
2181 (error "%s error: %s" ispell-grep-command (car results)))) | |
2182 results)) | |
2183 | |
2184 | |
2185 ;;; "ispell-filter" is a list of output lines from the generating function. | |
2186 ;;; Each full line (ending with \n) is a separate item on the list. | |
2187 ;;; "output" can contain multiple lines, part of a line, or both. | |
2188 ;;; "start" and "end" are used to keep bounds on lines when "output" contains | |
2189 ;;; multiple lines. | |
2190 ;;; "ispell-filter-continue" is true when we have received only part of a | |
2191 ;;; line as output from a generating function ("output" did not end with \n) | |
14040 | 2192 ;;; THIS FUNCTION WILL FAIL IF THE PROCESS OUTPUT DOESN'T END WITH \n! |
6138 | 2193 ;;; This is the case when a process dies or fails. The default behavior |
2194 ;;; in this case treats the next input received as fresh input. | |
2195 | |
2196 (defun ispell-filter (process output) | |
2197 "Output filter function for ispell, grep, and look." | |
2198 (let ((start 0) | |
2199 (continue t) | |
2200 end) | |
2201 (while continue | |
2202 (setq end (string-match "\n" output start)) ; get text up to the newline. | |
2203 ;; If we get out of sync and ispell-filter-continue is asserted when we | |
2204 ;; are not continuing, treat the next item as a separate list. When | |
2205 ;; ispell-filter-continue is asserted, ispell-filter *should* always be a | |
2206 ;; list! | |
2207 | |
2208 ;; Continue with same line (item)? | |
2209 (if (and ispell-filter-continue ispell-filter (listp ispell-filter)) | |
2210 ;; Yes. Add it to the prev item | |
2211 (setcar ispell-filter | |
2212 (concat (car ispell-filter) (substring output start end))) | |
2213 ;; No. This is a new line and item. | |
2214 (setq ispell-filter | |
2215 (cons (substring output start end) ispell-filter))) | |
2216 (if (null end) | |
2217 ;; We've completed reading the output, but didn't finish the line. | |
2218 (setq ispell-filter-continue t continue nil) | |
2219 ;; skip over newline, this line complete. | |
2220 (setq ispell-filter-continue nil end (1+ end)) | |
2221 (if (= end (length output)) ; No more lines in output | |
2222 (setq continue nil) ; so we can exit the filter. | |
2223 (setq start end)))))) ; else move start to next line of input | |
2224 | |
2225 | |
2226 ;;; This function destroys the mark location if it is in the word being | |
2227 ;;; highlighted. | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2228 (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
|
2229 refresh) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2230 "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
|
2231 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
|
2232 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
|
2233 Uses block cursor to highlight one character. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2234 Optional REFRESH will unhighlighted then highlight, using block cursor |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2235 highlighting when REFRESH is equal to `block'." |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2236 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2237 (or (eq 'block refresh) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2238 (setq start (1+ start)))) ; On block non-refresh, inc start. |
6138 | 2239 (let ((modified (buffer-modified-p)) ; don't allow this fn to modify buffer |
2240 (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
|
2241 (text (buffer-substring-no-properties start end)) ; Save hilight region |
6138 | 2242 (inhibit-quit t) ; inhibit interrupt processing here. |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2243 (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
|
2244 (goto-char end) |
6138 | 2245 (delete-region start end) |
14040 | 2246 (insert-char ? (- end start)) ; minimize amount of redisplay |
6138 | 2247 (sit-for 0) ; update display |
2248 (if highlight (setq inverse-video (not inverse-video))) ; toggle video | |
2249 (delete-region start end) ; delete whitespace | |
2250 (insert text) ; insert text in inverse video. | |
2251 (sit-for 0) ; update display showing inverse video. | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2252 (if (not highlight) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2253 (goto-char end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2254 (setq inverse-video (not inverse-video)) ; toggle video |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2255 (and (eq 'block ispell-highlight-p) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2256 (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
|
2257 (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
|
2258 (and refresh ; re-highlight |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2259 (ispell-highlight-spelling-error-generic |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2260 (if (eq 'block refresh) start (- start 2)) end t)))) |
6138 | 2261 |
2262 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2263 (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
|
2264 "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
|
2265 When the optional third arg HIGHLIGHT is set, the word is highlighted, |
6138 | 2266 otherwise it is displayed normally." |
2267 (if highlight | |
2268 (isearch-highlight start end) | |
60714
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2269 (isearch-dehighlight)) |
6138 | 2270 ;;(sit-for 0) |
2271 ) | |
2272 | |
2273 | |
7606 | 2274 (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
|
2275 "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
|
2276 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
|
2277 otherwise it is displayed normally. |
7606 | 2278 |
7607 | 2279 The variable `ispell-highlight-face' selects the face to use for highlighting." |
6138 | 2280 (if highlight |
2281 (progn | |
2282 (setq ispell-overlay (make-overlay start end)) | |
60714
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2283 (overlay-put ispell-overlay 'priority 1) ;higher than lazy overlays |
6138 | 2284 (overlay-put ispell-overlay 'face ispell-highlight-face)) |
60714
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2285 (delete-overlay ispell-overlay)) |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2286 (if (and ispell-lazy-highlight (boundp 'lazy-highlight-cleanup)) |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2287 (if highlight |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2288 (let ((isearch-string |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2289 (concat |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2290 "\\b" |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2291 (regexp-quote (buffer-substring-no-properties start end)) |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2292 "\\b")) |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2293 (isearch-regexp t) |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2294 (isearch-case-fold-search nil)) |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2295 (isearch-lazy-highlight-new-loop |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2296 (if (boundp 'reg-start) reg-start) |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2297 (if (boundp 'reg-end) reg-end))) |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2298 (lazy-highlight-cleanup lazy-highlight-cleanup) |
438b974e257c
(ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents:
60530
diff
changeset
|
2299 (setq isearch-lazy-highlight-last-string nil)))) |
6138 | 2300 |
2301 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2302 (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
|
2303 (cond |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
2304 ((featurep 'xemacs) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2305 (ispell-highlight-spelling-error-xemacs start end highlight)) |
40412
acbdf8dbf6d4
(version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
39186
diff
changeset
|
2306 ((and (featurep 'faces) |
30546
26e5d26a83ed
(ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents:
29208
diff
changeset
|
2307 (or (and (fboundp 'display-color-p) (display-color-p)) |
26e5d26a83ed
(ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents:
29208
diff
changeset
|
2308 window-system)) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2309 (ispell-highlight-spelling-error-overlay start end highlight)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2310 (t (ispell-highlight-spelling-error-generic start end highlight refresh)))) |
6138 | 2311 |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2312 (defun ispell-adjusted-window-height (&optional window) |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2313 "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
|
2314 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
|
2315 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
|
2316 `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
|
2317 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
|
2318 `window-height'." |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2319 (cond ((fboundp 'window-text-height) |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2320 (1+ (window-text-height window))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2321 ((or (and (fboundp 'display-graphic-p) (display-graphic-p)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2322 (and (featurep 'xemacs) window-system)) |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2323 (1- (window-height window))) |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2324 (t |
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2325 (window-height window)))) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2326 |
6138 | 2327 (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
|
2328 "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
|
2329 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
|
2330 scrolling the current window. Leave the new window selected." |
6138 | 2331 (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
|
2332 (let ((oldot (save-excursion (vertical-motion -1) (point))) |
6138 | 2333 (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
|
2334 ;; If line above old point (line starting at oldot) would be |
6138 | 2335 ;; hidden by new window, scroll it to just below new win |
2336 ;; otherwise set top line of other win so it doesn't scroll. | |
2337 (if (< oldot top) (setq top oldot)) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2338 ;; if frame is unsplitable, temporarily disable that... |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2339 (if (cdr (assq 'unsplittable (frame-parameters (selected-frame)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2340 (let ((frame (selected-frame))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2341 (modify-frame-parameters frame '((unsplittable . nil))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2342 (split-window nil height) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2343 (modify-frame-parameters frame '((unsplittable . t)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2344 (split-window nil height)) |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2345 (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
|
2346 (when (> deficit 0) |
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2347 ;; 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
|
2348 ;; 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
|
2349 (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
|
2350 (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
|
2351 (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
|
2352 (setq top (min (point) oldot)))) |
6138 | 2353 (set-window-start (next-window) top)))) |
2354 | |
2355 | |
2356 ;;; Should we add a compound word match return value? | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2357 (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
|
2358 "Parse the OUTPUT string from Ispell process and return: |
7607 | 2359 1: t for an exact match. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2360 2: A string containing the root word matched via suffix removal. |
6138 | 2361 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
|
2362 (\"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
|
2363 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
|
2364 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
|
2365 MISS-LIST and GUESS-LIST are possibly null lists of guesses and misses. |
42206 | 2366 4: nil when an error has occurred. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2367 |
37007
4caced3e865e
(ispell-parse-output): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
36815
diff
changeset
|
2368 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
|
2369 Optional third arg SHIFT is an offset to apply based on previous corrections." |
6138 | 2370 (cond |
2371 ((string= output "") t) ; for startup with pipes... | |
2372 ((string= output "*") t) ; exact match | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2373 ((string= output "-") t) ; compound word match |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
2374 ((eq (aref output 0) ?+) ; found because of root word |
6138 | 2375 (substring output 2)) ; return root word |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2376 ((equal 0 (string-match "[\ra-zA-Z]" output)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2377 (ding) ; error message from ispell! |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2378 (message (concat "Ispell error: " output)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2379 (sit-for 5) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2380 nil) |
6138 | 2381 (t ; need to process &, ?, and #'s |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
2382 (let ((type (aref output 0)) ; &, ?, or # |
6138 | 2383 (original-word (substring output 2 (string-match " " output 2))) |
2384 (cur-count 0) ; contains number of misses + guesses | |
2385 count miss-list guess-list offset) | |
2386 (setq output (substring output (match-end 0))) ; skip over misspelling | |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
2387 (if (eq type ?#) |
6138 | 2388 (setq count 0) ; no misses for type # |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62156
diff
changeset
|
2389 (setq count (string-to-number output) ; get number of misses. |
6138 | 2390 output (substring output (1+ (string-match " " output 1))))) |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62156
diff
changeset
|
2391 (setq offset (string-to-number output)) |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
2392 (if (eq type ?#) ; No miss or guess list. |
6138 | 2393 (setq output nil) |
2394 (setq output (substring output (1+ (string-match " " output 1))))) | |
2395 (while output | |
2396 (let ((end (string-match ", \\|\\($\\)" output))) ; end of miss/guess. | |
2397 (setq cur-count (1+ cur-count)) | |
2398 (if (> cur-count count) | |
2399 (setq guess-list (cons (substring output 0 end) guess-list)) | |
2400 (setq miss-list (cons (substring output 0 end) miss-list))) | |
2401 (if (match-end 1) ; True only when at end of line. | |
2402 (setq output nil) ; no more misses or guesses | |
2403 (setq output (substring output (+ end 2)))))) | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2404 ;; return results. Accept word if it was already accepted. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2405 ;; adjust offset. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2406 (if (member original-word accept-list) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2407 t |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2408 (list original-word |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2409 (if (numberp shift) (+ shift offset) offset) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2410 (nreverse miss-list) (nreverse guess-list))))))) |
6138 | 2411 |
2412 | |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2413 (defun ispell-process-status () |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2414 "Return the status of the Ispell process. |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2415 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
|
2416 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2417 (process-status ispell-process) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2418 (and ispell-process 'run))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2419 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2420 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2421 (defun ispell-start-process () |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2422 "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
|
2423 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
|
2424 (let (args) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2425 ;; Local dictionary becomes the global dictionary in use. |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2426 (setq ispell-current-dictionary |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2427 (or ispell-local-dictionary ispell-dictionary)) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2428 (setq args (ispell-get-ispell-args)) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2429 (if (and ispell-current-dictionary ; use specified dictionary |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2430 (not (member "-d" args))) ; only define if not overridden |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2431 (setq args |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2432 (append (list "-d" ispell-current-dictionary) args))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2433 (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
|
2434 (setq args |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2435 (append args |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2436 (list "-p" |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2437 (expand-file-name ispell-personal-dictionary))))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2438 (setq args (append args ispell-extra-args)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2439 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2440 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2441 (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
|
2442 (apply 'start-process |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2443 "ispell" nil ispell-program-name |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2444 "-a" ; accept single input lines |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2445 "-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
|
2446 args)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2447 (setq ispell-cmd-args args |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2448 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
|
2449 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
|
2450 (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
|
2451 t))) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2452 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2453 |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2454 |
6138 | 2455 (defun ispell-init-process () |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2456 "Check status of Ispell process and start if necessary." |
6138 | 2457 (if (and ispell-process |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2458 (eq (ispell-process-status) 'run) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2459 ;; If we're using a personal dictionary, ensure |
6138 | 2460 ;; we're in the same default directory! |
2461 (or (not ispell-personal-dictionary) | |
2462 (equal ispell-process-directory default-directory))) | |
2463 (setq ispell-filter nil ispell-filter-continue nil) | |
2464 ;; may need to restart to select new personal dictionary. | |
2465 (ispell-kill-ispell t) | |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2466 (message "Starting new Ispell process...") |
6138 | 2467 (sit-for 0) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2468 (setq ispell-library-directory (ispell-check-version) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2469 ispell-process-directory default-directory |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2470 ispell-process (ispell-start-process) |
6138 | 2471 ispell-filter nil |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2472 ispell-filter-continue nil) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2473 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2474 (set-process-filter ispell-process 'ispell-filter)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2475 ;; protect against bogus binding of `enable-multibyte-characters' in XEmacs |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
2476 (if (and (or (featurep 'xemacs) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2477 (and (boundp 'enable-multibyte-characters) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2478 enable-multibyte-characters)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2479 (fboundp 'set-process-coding-system)) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2480 (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
|
2481 (ispell-get-coding-system))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2482 ;; Get version ID line |
40412
acbdf8dbf6d4
(version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
39186
diff
changeset
|
2483 (ispell-accept-output 3) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2484 ;; get more output if filter empty? |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2485 (if (null ispell-filter) (ispell-accept-output 3)) |
6138 | 2486 (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
|
2487 (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
|
2488 ((and |
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
2489 (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
|
2490 (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
|
2491 (progn |
40412
acbdf8dbf6d4
(version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
39186
diff
changeset
|
2492 (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
|
2493 (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
|
2494 (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
|
2495 (string-match "^@(#) " (car ispell-filter))) |
6138 | 2496 ;; got the version line as expected (we already know it's the right |
2497 ;; version, so don't bother checking again.) | |
2498 nil) | |
2499 (t | |
2500 ;; Otherwise, it must be an error message. Show the user. | |
2501 ;; But first wait to see if some more output is going to arrive. | |
2502 ;; Otherwise we get cool errors like "Can't open ". | |
2503 (sleep-for 1) | |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2504 (ispell-accept-output 3) |
6138 | 2505 (error "%s" (mapconcat 'identity ispell-filter "\n")))) |
2506 (setq ispell-filter nil) ; Discard version ID line | |
2507 (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
|
2508 (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
|
2509 (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
|
2510 (if ispell-async-processp |
57516
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
2511 (set-process-query-on-exit-flag ispell-process nil)))) |
6138 | 2512 |
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
2513 ;;;###autoload |
6138 | 2514 (defun ispell-kill-ispell (&optional no-error) |
7607 | 2515 "Kill current Ispell process (so that you may start a fresh one). |
2516 With NO-ERROR, just return non-nil if there was no Ispell running." | |
6138 | 2517 (interactive) |
2518 (if (not (and ispell-process | |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2519 (eq (ispell-process-status) 'run))) |
6138 | 2520 (or no-error |
2521 (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
|
2522 (if ispell-async-processp |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2523 (progn |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2524 (process-send-eof ispell-process) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2525 (if (eq (ispell-process-status) 'run) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2526 (ispell-accept-output 1)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2527 (if (eq (ispell-process-status) 'run) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2528 (kill-process ispell-process)) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2529 (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
|
2530 (eq (ispell-process-status) 'signal))) |
40412
acbdf8dbf6d4
(version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
39186
diff
changeset
|
2531 (sleep-for 0.25))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2532 ;; synchronous processes |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2533 (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
|
2534 (kill-buffer ispell-output-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2535 (kill-buffer ispell-session-buffer) |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2536 (setq ispell-output-buffer nil |
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2537 ispell-session-buffer nil)) |
6138 | 2538 (setq ispell-process nil) |
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2539 (message "Ispell process killed") |
6138 | 2540 nil)) |
2541 | |
2542 | |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2543 ;;; 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
|
2544 ;;; 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
|
2545 |
6138 | 2546 ;;;###autoload |
2547 (defun ispell-change-dictionary (dict &optional arg) | |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2548 "Change to dictionary DICT for Ispell. |
60284
196128d3d9e8
(ispell-change-dictionary): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
60182
diff
changeset
|
2549 With a prefix arg, set it \"globally\", for all buffers. |
196128d3d9e8
(ispell-change-dictionary): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
60182
diff
changeset
|
2550 Without a prefix arg, set it \"locally\", just for this buffer. |
196128d3d9e8
(ispell-change-dictionary): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
60182
diff
changeset
|
2551 |
196128d3d9e8
(ispell-change-dictionary): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
60182
diff
changeset
|
2552 By just answering RET you can find out what the current dictionary is." |
6138 | 2553 (interactive |
2554 (list (completing-read | |
2555 "Use new dictionary (RET for current, SPC to complete): " | |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2556 (and (fboundp 'ispell-valid-dictionary-list) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2557 (mapcar 'list (ispell-valid-dictionary-list))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2558 nil t) |
6138 | 2559 current-prefix-arg)) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2560 (unless arg (ispell-accept-buffer-local-defs)) |
6138 | 2561 (if (equal dict "default") (setq dict nil)) |
2562 ;; This relies on completing-read's bug of returning "" for no match | |
2563 (cond ((equal dict "") | |
2564 (message "Using %s dictionary" | |
2565 (or ispell-local-dictionary ispell-dictionary "default"))) | |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2566 ((equal dict (or ispell-local-dictionary |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2567 ispell-dictionary "default")) |
6138 | 2568 ;; 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
|
2569 (and (interactive-p) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2570 (message "No change, using %s dictionary" dict))) |
6138 | 2571 (t ; reset dictionary! |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2572 (if (or (assoc dict ispell-local-dictionary-alist) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2573 (assoc dict ispell-dictionary-alist)) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2574 (if arg |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2575 ;; set default dictionary |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2576 (setq ispell-dictionary dict) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2577 ;; set local dictionary |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2578 (setq ispell-local-dictionary dict) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2579 (setq ispell-local-dictionary-overridden t)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2580 (error "Undefined dictionary: %s" dict)) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2581 (message "%s Ispell dictionary set to %s" |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2582 (if arg "Global" "Local") |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2583 dict)))) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2584 |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2585 (defun ispell-internal-change-dictionary () |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2586 "Update the dictionary actually used by Ispell. |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2587 This may kill the Ispell process; if so, |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2588 a new one will be started when needed." |
59907
0bdb128b5dcf
(ispell-internal-change-dictionary): Fix problem in recent changes, where
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59822
diff
changeset
|
2589 (let ((dict (or ispell-local-dictionary ispell-dictionary))) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2590 (unless (equal ispell-current-dictionary dict) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2591 (setq ispell-current-dictionary dict) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2592 (ispell-kill-ispell t)))) |
6138 | 2593 |
2594 | |
2595 ;;; Spelling of comments are checked when ispell-check-comments is non-nil. | |
2596 | |
2597 ;;;###autoload | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2598 (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
|
2599 "Interactively check a region for spelling errors. |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2600 Return nil if spell session is quit, |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2601 otherwise returns shift offset amount for last line processed." |
6138 | 2602 (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
|
2603 (if (not recheckp) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2604 (ispell-accept-buffer-local-defs)) ; set up dictionary, local words, etc. |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2605 (let ((skip-region-start (make-marker)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2606 (rstart (make-marker))) |
6138 | 2607 (unwind-protect |
7606 | 2608 (save-excursion |
64196
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
2609 (message "Spell checking %s using %s with %s dictionary..." |
7606 | 2610 (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
|
2611 (buffer-name) "region") |
64196
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
2612 (file-name-nondirectory ispell-program-name) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2613 (or ispell-current-dictionary "default")) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2614 ;; Returns cursor to original location. |
7606 | 2615 (save-window-excursion |
2616 (goto-char reg-start) | |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2617 (let ((transient-mark-mode) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2618 (case-fold-search case-fold-search) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2619 (query-fcc t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2620 in-comment key) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2621 (let (message-log-max) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2622 (message "searching for regions to skip")) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2623 (if (re-search-forward (ispell-begin-skip-region-regexp) reg-end t) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2624 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2625 (setq key (buffer-substring-no-properties |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2626 (match-beginning 0) (match-end 0))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2627 (set-marker skip-region-start (- (point) (length key))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2628 (goto-char reg-start))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2629 (let (message-log-max) |
64196
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
2630 (message "Continuing spelling check using %s with %s dictionary..." |
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
2631 (file-name-nondirectory ispell-program-name) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
2632 (or ispell-current-dictionary "default"))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2633 (set-marker rstart reg-start) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2634 (set-marker ispell-region-end reg-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2635 (while (and (not ispell-quit) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2636 (< (point) ispell-region-end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2637 ;; spell-check region with skipping |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2638 (if (and (marker-position skip-region-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2639 (<= skip-region-start (point))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2640 (progn |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2641 ;; If region inside line comment, must keep comment start. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2642 (setq in-comment (point) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2643 in-comment |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2644 (and comment-start |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2645 (or (null comment-end) (string= "" comment-end)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2646 (save-excursion |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2647 (beginning-of-line) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2648 (re-search-forward comment-start in-comment t)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2649 comment-start)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2650 ;; Can change skip-regexps (in ispell-message) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2651 (ispell-skip-region key) ; moves pt past region. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2652 (set-marker rstart (point)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2653 ;; check for saving large attachments... |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2654 (setq query-fcc (and query-fcc |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2655 (ispell-ignore-fcc skip-region-start |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2656 rstart))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2657 (if (and (< rstart ispell-region-end) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2658 (re-search-forward |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2659 (ispell-begin-skip-region-regexp) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2660 ispell-region-end t)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2661 (progn |
63139
be61de52f953
(ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents:
62402
diff
changeset
|
2662 (setq key (match-string-no-properties 0)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2663 (set-marker skip-region-start |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2664 (- (point) (length key))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2665 (goto-char rstart)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2666 (set-marker skip-region-start nil)))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2667 (setq reg-end (max (point) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2668 (if (marker-position skip-region-start) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2669 (min skip-region-start ispell-region-end) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2670 (marker-position ispell-region-end)))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2671 (let* ((start (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2672 (end (save-excursion (end-of-line) (min (point) reg-end))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2673 (string (ispell-get-line start end in-comment))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2674 (if in-comment ; account for comment chars added |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2675 (setq start (- start (length in-comment)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2676 in-comment nil)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2677 (setq end (point)) ; "end" tracks region retrieved. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2678 (if string ; there is something to spell check! |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2679 ;; (special start end) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2680 (setq shift (ispell-process-line string |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2681 (and recheckp shift)))) |
7606 | 2682 (goto-char end))))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2683 (if ispell-quit |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2684 nil |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2685 (or shift 0))) |
7606 | 2686 ;; protected |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2687 (if (and (not (and recheckp ispell-keep-choices-win)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2688 (get-buffer ispell-choices-buffer)) |
7606 | 2689 (kill-buffer ispell-choices-buffer)) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2690 (set-marker skip-region-start nil) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2691 (set-marker rstart nil) |
7606 | 2692 (if ispell-quit |
2693 (progn | |
2694 ;; preserve or clear the region for ispell-continue. | |
2695 (if (not (numberp ispell-quit)) | |
2696 (set-marker ispell-region-end nil) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2697 ;; Ispell-continue enabled - ispell-region-end is set. |
7606 | 2698 (goto-char ispell-quit)) |
2699 ;; Check for aborting | |
2700 (if (and ispell-checking-message (numberp ispell-quit)) | |
2701 (progn | |
2702 (setq ispell-quit nil) | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2703 (error "Message send aborted"))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2704 (if (not recheckp) (setq ispell-quit nil))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2705 (if (not recheckp) (set-marker ispell-region-end nil)) |
7606 | 2706 ;; Only save if successful exit. |
2707 (ispell-pdict-save ispell-silently-savep) | |
64196
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
2708 (message "Spell-checking using %s with %s dictionary done" |
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
2709 (file-name-nondirectory ispell-program-name) |
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
2710 (or ispell-current-dictionary "default")))))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2711 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2712 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2713 (defun ispell-begin-skip-region-regexp () |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2714 "Returns a regexp of the search keys for region skipping. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2715 Includes `ispell-skip-region-alist' plus tex, tib, html, and comment keys. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2716 Must call after ispell-buffer-local-parsing due to dependence on mode." |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2717 ;; start with regions generic to all buffers |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2718 (let ((skip-regexp (ispell-begin-skip-region ispell-skip-region-alist))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2719 ;; Comments |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2720 (if (and (null ispell-check-comments) comment-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2721 (setq skip-regexp (concat (regexp-quote comment-start) "\\|" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2722 skip-regexp))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2723 (if (and (eq 'exclusive ispell-check-comments) comment-start) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2724 ;; search from end of current comment to start of next comment. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2725 (setq skip-regexp (concat (if (string= "" comment-end) "^" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2726 (regexp-quote comment-end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2727 "\\|" skip-regexp))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2728 ;; tib |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2729 (if ispell-skip-tib |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2730 (setq skip-regexp (concat ispell-tib-ref-beginning "\\|" skip-regexp))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2731 ;; html stuff |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2732 (if ispell-skip-html |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2733 (setq skip-regexp (concat |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2734 (ispell-begin-skip-region ispell-html-skip-alists) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2735 "\\|" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2736 skip-regexp))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2737 ;; tex |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2738 (if (eq ispell-parser 'tex) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2739 (setq skip-regexp (concat (ispell-begin-tex-skip-regexp) "\\|" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2740 skip-regexp))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2741 ;; messages |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2742 (if (and ispell-checking-message |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2743 (not (eq t ispell-checking-message))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2744 (setq skip-regexp (concat |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2745 (mapconcat (lambda (lst) (car lst)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2746 ispell-checking-message |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2747 "\\|") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2748 "\\|" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2749 skip-regexp))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2750 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2751 ;; return new regexp |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2752 skip-regexp)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2753 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2754 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2755 (defun ispell-begin-skip-region (skip-alist) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2756 "Regular expression for start of regions to skip generated from SKIP-ALIST. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2757 Each selection should be a key of SKIP-ALIST; |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2758 otherwise, the current line is skipped." |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2759 (mapconcat (lambda (lst) (if (stringp (car lst)) (car lst) (eval (car lst)))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2760 skip-alist |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2761 "\\|")) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2762 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2763 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2764 (defun ispell-begin-tex-skip-regexp () |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2765 "Regular expression of tex commands to skip. |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2766 Generated from `ispell-tex-skip-alists'." |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2767 (concat |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2768 ;; raw tex keys |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2769 (mapconcat (function (lambda (lst) (car lst))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2770 (car ispell-tex-skip-alists) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2771 "\\|") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2772 "\\|" |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2773 ;; keys wrapped in begin{} |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2774 (mapconcat (function (lambda (lst) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2775 (concat "\\\\begin[ \t\n]*{[ \t\n]*" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2776 (car lst) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2777 "[ \t\n]*}"))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2778 (car (cdr ispell-tex-skip-alists)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2779 "\\|"))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2780 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2781 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2782 (defun ispell-skip-region-list () |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2783 "Returns a list describing key and body regions to skip for this buffer. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2784 Includes regions defined by `ispell-skip-region-alist', tex mode, |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2785 `ispell-html-skip-alists', and `ispell-checking-message'. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2786 Manual checking must include comments and tib references. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2787 The list is of the form described by variable `ispell-skip-region-alist'. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2788 Must call after `ispell-buffer-local-parsing' due to dependence on mode." |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2789 (let ((skip-alist ispell-skip-region-alist)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2790 ;; only additional explicit region definition is tex. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2791 (if (eq ispell-parser 'tex) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2792 (setq case-fold-search nil |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2793 skip-alist (append (car ispell-tex-skip-alists) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2794 (car (cdr ispell-tex-skip-alists)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2795 skip-alist))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2796 (if ispell-skip-html |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2797 (setq skip-alist (append ispell-html-skip-alists skip-alist))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2798 (if (and ispell-checking-message |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2799 (not (eq t ispell-checking-message))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2800 (setq skip-alist (append ispell-checking-message skip-alist))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2801 skip-alist)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2802 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2803 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2804 (defun ispell-tex-arg-end (&optional arg) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2805 "Skip across ARG number of braces." |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2806 (condition-case nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2807 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2808 (while (looking-at "[ \t\n]*\\[") (forward-sexp)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2809 (forward-sexp (or arg 1))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2810 (error |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2811 (message "error skipping s-expressions at point %d." (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2812 (beep) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2813 (sit-for 2)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2814 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2815 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2816 (defun ispell-ignore-fcc (start end) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2817 "Deletes the Fcc: message header when large attachments are included. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2818 Return value `nil' if file with large attachments are saved. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2819 This can be used to avoid multiple questions for multiple large attachments. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2820 Returns point to starting location afterwards." |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2821 (let ((result t)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2822 (if (and ispell-checking-message ispell-message-fcc-skip) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2823 (if (< ispell-message-fcc-skip (- end start)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2824 (let (case-fold-search head-end) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2825 (goto-char (point-min)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2826 (setq head-end |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2827 (or (re-search-forward |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2828 (concat "^" (regexp-quote mail-header-separator) "$") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2829 nil t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2830 (re-search-forward "^$" nil t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2831 (point-min))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2832 (goto-char (point-min)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2833 (if (re-search-forward "^Fcc:" head-end t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2834 (if (y-or-n-p |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2835 "Save copy of this message with large attachments? ") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2836 (setq result nil) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2837 (beginning-of-line) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2838 (kill-line 1))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2839 (goto-char end)))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2840 result)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2841 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2842 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2843 (defun ispell-skip-region (key) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2844 "Skips across KEY and then to end of region. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2845 Key lookup determines region to skip. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2846 Point is placed at end of skipped region." |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2847 ;; move over key to begin checking. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2848 (forward-char (length key)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2849 (let ((start (point)) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2850 ;; Regenerate each call... This function can change region definition. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2851 (alist (ispell-skip-region-list)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2852 alist-key null-skip) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2853 (cond |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2854 ;; what about quoted comment, or comment inside strings? |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2855 ((and (null ispell-check-comments) comment-start |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2856 (string= key comment-start)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2857 (if (string= "" comment-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2858 (forward-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2859 (search-forward comment-end ispell-region-end t))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2860 ((and (eq 'exclusive ispell-check-comments) comment-start |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2861 (string= key comment-end)) |
22526
56bcedfdbe83
(ispell-skip-region): Don't complain when
Karl Heuer <kwzh@gnu.org>
parents:
22461
diff
changeset
|
2862 (search-forward comment-start ispell-region-end :end)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2863 ((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
|
2864 (re-search-forward ispell-tib-ref-end ispell-region-end t)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2865 ;; markings from alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2866 (t |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2867 (while alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2868 (setq alist-key (eval (car (car alist)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2869 (if (string-match alist-key key) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2870 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2871 (setq alist (cdr (car alist))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2872 (cond |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2873 ((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
|
2874 ((not (consp alist)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2875 ;; 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
|
2876 (re-search-forward (eval alist) (point-max) t)) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2877 ((and (= 1 (length alist)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2878 (stringp (car alist))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2879 (re-search-forward (car alist) (point-max) t)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2880 (t |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2881 (setq null-skip t) ; error handling in functions! |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2882 (if (consp (cdr alist)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2883 (apply (car alist) (cdr alist)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2884 (funcall (car alist))))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2885 (setq alist nil)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2886 (setq alist (cdr alist)))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2887 (if (and (= start (point)) (null null-skip)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2888 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2889 (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
|
2890 key (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2891 (beep) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2892 (sit-for 2))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2893 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2894 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2895 ;;; Grab the next line of data. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2896 ;;; Returns a string with the line data |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2897 (defun ispell-get-line (start end in-comment) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2898 (let ((ispell-casechars (ispell-get-casechars)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2899 string) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2900 (cond ; LOOK AT THIS LINE AND SKIP OR PROCESS |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2901 ((eolp) ; END OF LINE, just go to next line. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2902 (forward-line)) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2903 ;;((looking-at "[-#@*+!%~^]") ; SKIP SPECIAL ISPELL CHARACTERS |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2904 ;; (forward-char 1)) ; not needed as quoted below. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2905 ((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
|
2906 (re-search-forward "[][()${}]" end t)) ; or MATH COMMANDS |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2907 (setq string (concat "^" in-comment |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
2908 (buffer-substring-no-properties start end) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2909 "\n")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2910 (goto-char end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2911 (t (goto-char end))) ; EMPTY LINE, skip it. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2912 string)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2913 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2914 |
59627
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
2915 (defun ispell-looking-at (string) |
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
2916 (let ((coding (ispell-get-coding-system)) |
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
2917 (len (length string))) |
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
2918 (and (<= (+ (point) len) (point-max)) |
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
2919 (equal (encode-coding-string string coding) |
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
2920 (encode-coding-string (buffer-substring-no-properties |
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
2921 (point) (+ (point) len)) |
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
2922 coding))))) |
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
2923 |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2924 ;;; 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
|
2925 (eval-when-compile |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2926 (defvar start) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2927 (defvar end)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2928 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2929 (defun ispell-process-line (string shift) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2930 "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
|
2931 This will modify the buffer for spelling errors. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2932 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
|
2933 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
|
2934 ;;(declare special start end) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2935 (let (poss accept-list) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2936 (if (not (numberp shift)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2937 (setq shift 0)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2938 ;; 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
|
2939 (ispell-send-string string) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2940 (while (progn |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2941 (ispell-accept-output) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2942 ;; Last item of output contains a blank line. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2943 (not (string= "" (car ispell-filter))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2944 ;; 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
|
2945 ;; Place in FIFO order and remove the blank item. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2946 (setq ispell-filter (nreverse (cdr ispell-filter))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2947 (while (and (not ispell-quit) ispell-filter) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2948 ;; get next word, accounting for accepted words and start shifts |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2949 (setq poss (ispell-parse-output (car ispell-filter) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2950 accept-list shift)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2951 (if (and poss (listp poss)) ; spelling error occurred. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2952 ;; Whenever we have misspellings, we can change |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2953 ;; the buffer. Keep boundaries as markers. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2954 ;; Markers can move with highlighting! This destroys |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2955 ;; 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
|
2956 (let ((word-start |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2957 (copy-marker (+ start ispell-offset (car (cdr poss))))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2958 (word-len (length (car poss))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2959 (line-end (copy-marker end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2960 (line-start (copy-marker start)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2961 recheck-region replace) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2962 (goto-char word-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2963 ;; Adjust the horizontal scroll & point |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2964 (ispell-horiz-scroll) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2965 (goto-char (+ word-len word-start)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2966 (ispell-horiz-scroll) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2967 (goto-char word-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2968 (ispell-horiz-scroll) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2969 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2970 ;; Alignment cannot be tracked and this error will occur when |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2971 ;; `query-replace' makes multiple corrections on the starting line. |
59627
24c3aed806c6
(ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents:
59510
diff
changeset
|
2972 (or (ispell-looking-at (car poss)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2973 ;; This occurs due to filter pipe problems |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2974 (error (concat "Ispell misalignment: word " |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2975 "`%s' point %d; probably incompatible versions") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2976 (car poss) (marker-position word-start))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2977 ;; ispell-cmd-loop can go recursive & change buffer |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2978 (if ispell-keep-choices-win |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2979 (setq replace (ispell-command-loop |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2980 (car (cdr (cdr poss))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2981 (car (cdr (cdr (cdr poss)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2982 (car poss) (marker-position word-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2983 (+ word-len (marker-position word-start)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2984 (save-window-excursion |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2985 (setq replace (ispell-command-loop |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2986 (car (cdr (cdr poss))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2987 (car (cdr (cdr (cdr poss)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2988 (car poss) (marker-position word-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2989 (+ word-len (marker-position word-start)))))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2990 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2991 (goto-char word-start) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2992 ;; Recheck when query replace edit changes misspelled word. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2993 ;; 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
|
2994 (if (and replace (listp replace) (= 2 (length replace))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2995 (if (and (eq ispell-parser 'tex) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2996 (string-match "[\\\\][]()[]\\|\\\\begin\\|\\$" |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2997 (regexp-quote string))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2998 (error |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2999 "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
|
3000 ) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3001 (set-marker line-end (point)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3002 (setq ispell-filter nil |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3003 recheck-region t))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3004 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3005 ;; insert correction if needed |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3006 (cond |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3007 ((or (null replace) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3008 (equal 0 replace)) ; ACCEPT/INSERT |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3009 (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3010 (ispell-add-per-file-word-list (car poss))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3011 ;; do not recheck accepted word on this line |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3012 (setq accept-list (cons (car poss) accept-list))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3013 (t ; replacement word selected or entered |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3014 (delete-region (point) (+ word-len (point))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3015 (if (not (listp replace)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3016 (progn |
60530
32fd45514893
(ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents:
60284
diff
changeset
|
3017 (ispell-insert-word replace) ; insert dictionary word |
56932
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
3018 (ispell-send-replacement (car poss) replace) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3019 (setq accept-list (cons replace accept-list))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3020 (let ((replace-word (car replace))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3021 ;; Recheck hand entered replacement word |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3022 (insert replace-word) |
56932
09766a703f68
(ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56875
diff
changeset
|
3023 (ispell-send-replacement (car poss) replace-word) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3024 (if (car (cdr replace)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3025 (save-window-excursion |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3026 (delete-other-windows) ; to correctly show help. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3027 ;; Assume case-replace & |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3028 ;; case-fold-search correct? |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3029 (query-replace (car poss) (car replace) t))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3030 (goto-char word-start) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3031 ;; do not recheck if already accepted |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3032 (if (member replace-word accept-list) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3033 (setq accept-list (cons replace-word accept-list) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3034 replace replace-word) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3035 (let ((region-end (copy-marker ispell-region-end))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3036 (setq recheck-region ispell-filter |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3037 ispell-filter nil ; save filter |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3038 shift 0 ; already accounted |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3039 shift (ispell-region |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3040 word-start |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3041 (+ word-start (length replace-word)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3042 t shift)) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3043 (if (null shift) ; quitting check. |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3044 (setq shift 0)) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3045 (set-marker ispell-region-end region-end) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3046 (set-marker region-end nil) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3047 (setq ispell-filter recheck-region |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3048 recheck-region nil |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3049 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
|
3050 |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3051 (setq shift (+ shift (- (length replace) word-len))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3052 |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3053 ;; Move line-start across word... |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3054 ;; new shift function does this now... |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3055 ;;(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
|
3056 ;; (- (length replace) |
313ef0d76864
(ispell-menu-map-needed): Check that ispell-process
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28563
diff
changeset
|
3057 ;; (length (car poss))))) |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3058 )) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3059 (if (not ispell-quit) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3060 (let (message-log-max) |
64196
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
3061 (message "Continuing spelling check using %s with %s dictionary..." |
9967974011d3
(ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
3062 (file-name-nondirectory ispell-program-name) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
3063 (or ispell-current-dictionary "default")))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3064 (sit-for 0) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3065 (setq start (marker-position line-start) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3066 end (marker-position line-end)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3067 ;; Adjust markers when end of region lost from highlighting. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3068 (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
|
3069 (setq end (+ word-start word-len))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3070 (if (= word-start ispell-region-end) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3071 (set-marker ispell-region-end (+ word-start word-len))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3072 ;; going out of scope - unneeded |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3073 (set-marker line-start nil) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3074 (set-marker word-start nil) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3075 (set-marker line-end nil))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3076 ;; finished with misspelling! |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3077 (setq ispell-filter (cdr ispell-filter))) |
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3078 shift)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3079 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3080 |
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
3081 ;;;###autoload |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
3082 (defun ispell-comments-and-strings () |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
3083 "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
|
3084 (interactive) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
3085 (goto-char (point-min)) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
3086 (let (state done) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
3087 (while (not done) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
3088 (setq done t) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
3089 (setq state (parse-partial-sexp (point) (point-max) |
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
3090 nil nil state 'syntax-table)) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3091 (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
|
3092 (let ((start (point))) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3093 (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
|
3094 nil nil state 'syntax-table)) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3095 (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
|
3096 (error "Unterminated string or comment")) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3097 (save-excursion |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3098 (setq done (not (ispell-region start (point)))))))))) |
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
3099 |
6138 | 3100 |
3101 ;;;###autoload | |
7606 | 3102 (defun ispell-buffer () |
6138 | 3103 "Check the current buffer for spelling errors interactively." |
3104 (interactive) | |
3105 (ispell-region (point-min) (point-max))) | |
3106 | |
7606 | 3107 |
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
3108 ;;;###autoload |
6138 | 3109 (defun ispell-continue () |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3110 "Continue a halted spelling session beginning with the current word." |
6138 | 3111 (interactive) |
3112 (if (not (marker-position ispell-region-end)) | |
3113 (message "No session to continue. Use 'X' command when checking!") | |
3114 (if (not (equal (marker-buffer ispell-region-end) (current-buffer))) | |
3115 (message "Must continue ispell from buffer %s" | |
3116 (buffer-name (marker-buffer ispell-region-end))) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3117 (ispell-region |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3118 ;; find beginning of current word: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3119 (car (cdr (ispell-get-word t))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3120 (marker-position ispell-region-end))))) |
6138 | 3121 |
3122 | |
3123 ;;; Horizontal scrolling | |
7606 | 3124 (defun ispell-horiz-scroll () |
3125 "Places point within the horizontal visibility of its window area." | |
6138 | 3126 (if truncate-lines ; display truncating lines? |
3127 ;; See if display needs to be scrolled. | |
3128 (let ((column (- (current-column) (max (window-hscroll) 1)))) | |
3129 (if (and (< column 0) (> (window-hscroll) 0)) | |
3130 (scroll-right (max (- column) 10)) | |
3131 (if (>= column (- (window-width) 2)) | |
3132 (scroll-left (max (- column (window-width) -3) 10))))))) | |
3133 | |
3134 | |
3135 ;;; Interactive word completion. | |
3136 ;;; Forces "previous-word" processing. Do we want to make this selectable? | |
3137 | |
3138 ;;;###autoload | |
3139 (defun ispell-complete-word (&optional interior-frag) | |
41949
66bf9fec7803
(ispell-complete-word): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
41937
diff
changeset
|
3140 "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
|
3141 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
|
3142 sequence inside of a word. |
6138 | 3143 |
3144 Standard ispell choices are then available." | |
3145 (interactive "P") | |
3146 (let ((cursor-location (point)) | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3147 (case-fold-search-val case-fold-search) |
6138 | 3148 (word (ispell-get-word nil "\\*")) ; force "previous-word" processing. |
3149 start end possibilities replacement) | |
3150 (setq start (car (cdr word)) | |
3151 end (car (cdr (cdr word))) | |
3152 word (car word) | |
3153 possibilities | |
3154 (or (string= word "") ; Will give you every word | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3155 (lookup-words (concat (and interior-frag "*") word |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3156 (if (or interior-frag (null ispell-look-p)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3157 "*")) |
6138 | 3158 ispell-complete-word-dict))) |
3159 (cond ((eq possibilities t) | |
3160 (message "No word to complete")) | |
3161 ((null possibilities) | |
3162 (message "No match for \"%s\"" word)) | |
3163 (t ; There is a modification... | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3164 (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
|
3165 (cond |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3166 ((string-equal (upcase word) word) |
7606 | 3167 (setq possibilities (mapcar 'upcase possibilities))) |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
3168 ((eq (upcase (aref word 0)) (aref word 0)) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3169 (setq possibilities (mapcar (function |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3170 (lambda (pos) |
50988
f4923c2899b6
(xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49599
diff
changeset
|
3171 (if (eq (aref word 0) (aref pos 0)) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3172 pos |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3173 (capitalize pos)))) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3174 possibilities)))) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3175 (setq case-fold-search case-fold-search-val) |
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
3176 (save-window-excursion |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
3177 (setq replacement |
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
3178 (ispell-command-loop possibilities nil word start end))) |
6138 | 3179 (cond |
3180 ((equal 0 replacement) ; BUFFER-LOCAL ADDITION | |
3181 (ispell-add-per-file-word-list word)) | |
3182 (replacement ; REPLACEMENT WORD | |
3183 (delete-region start end) | |
3184 (setq word (if (atom replacement) replacement (car replacement)) | |
3185 cursor-location (+ (- (length word) (- end start)) | |
3186 cursor-location)) | |
60530
32fd45514893
(ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents:
60284
diff
changeset
|
3187 (ispell-insert-word word) |
6138 | 3188 (if (not (atom replacement)) ; recheck spelling of replacement. |
3189 (progn | |
3190 (goto-char cursor-location) | |
3191 (ispell-word nil t))))) | |
3192 (if (get-buffer ispell-choices-buffer) | |
3193 (kill-buffer ispell-choices-buffer)))) | |
3194 (ispell-pdict-save ispell-silently-savep) | |
3195 (goto-char cursor-location))) | |
3196 | |
3197 | |
3198 ;;;###autoload | |
3199 (defun ispell-complete-word-interior-frag () | |
7606 | 3200 "Completes word matching character sequence inside a word." |
6138 | 3201 (interactive) |
3202 (ispell-complete-word t)) | |
3203 | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
3204 |
30563
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
3205 ;;;###autoload |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
3206 (defun ispell () |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
3207 "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
|
3208 If `transient-mark-mode' is on, and a region is active, spell-check |
34364 | 3209 that region. Otherwise spell-check the buffer. |
3210 | |
3211 Ispell dictionaries are not distributed with Emacs. If you are | |
3212 looking for a dictionary, please see the distribution of the GNU ispell | |
3213 program, or do an Internet search; there are various dictionaries | |
3214 available on the net." | |
30563
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
3215 (interactive) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3216 (if (and (boundp 'transient-mark-mode) transient-mark-mode |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3217 (boundp 'mark-active) mark-active) |
30563
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
3218 (ispell-region (region-beginning) (region-end)) |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
3219 (ispell-buffer))) |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
3220 |
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
3221 |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3222 ;;; ********************************************************************** |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3223 ;;; Ispell Minor Mode |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3224 ;;; ********************************************************************** |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3225 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3226 (defvar ispell-minor-mode nil |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3227 "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
|
3228 ;; 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
|
3229 (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
|
3230 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3231 (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
|
3232 (setq minor-mode-alist |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3233 (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
|
3234 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3235 (defvar ispell-minor-keymap |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3236 (let ((map (make-sparse-keymap))) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3237 (define-key map " " 'ispell-minor-check) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3238 (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
|
3239 map) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3240 "Keymap used for Ispell minor mode.") |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3241 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3242 (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
|
3243 (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
|
3244 (setq minor-mode-map-alist |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3245 (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
|
3246 minor-mode-map-alist))) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3247 |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3248 ;;;###autoload |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3249 (defun ispell-minor-mode (&optional arg) |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3250 "Toggle Ispell minor mode. |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3251 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
|
3252 |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3253 In Ispell minor mode, pressing SPC or RET |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3254 warns you if the previous word is incorrectly spelled. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3255 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3256 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
|
3257 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
|
3258 (interactive "P") |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3259 (setq ispell-minor-mode |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3260 (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
|
3261 (<= (prefix-numeric-value arg) 0)))) |
11562
8ff50a0715e1
(ispell-minor-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11469
diff
changeset
|
3262 (force-mode-line-update)) |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3263 |
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3264 (defun ispell-minor-check () |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3265 "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
|
3266 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
|
3267 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
|
3268 (interactive "*") |
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
3269 (let ((ispell-minor-mode nil) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3270 (ispell-check-only t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3271 (last-char (char-after (1- (point))))) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3272 (command-execute (key-binding (this-command-keys))) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3273 (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
|
3274 (and ispell-skip-html (eq last-char ?>)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3275 (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
|
3276 (ispell-word nil t)))) |
6138 | 3277 |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
3278 |
6138 | 3279 ;;; ********************************************************************** |
3280 ;;; Ispell Message | |
3281 ;;; ********************************************************************** | |
3282 | |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3283 (defvar ispell-message-text-end |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3284 (mapconcat (function identity) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3285 '( |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3286 ;; Don't spell check signatures |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3287 "^-- $" |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3288 ;; Matches postscript files. |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3289 ;;"^%!PS-Adobe-[123].0" |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3290 ;; Matches uuencoded text |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3291 ;;"^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
|
3292 ;; Matches shell files (especially auto-decoding) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
3293 "^#! /bin/[ck]?sh" |
8387
7dca276b66d8
(ispell-message-text-end): Improve context diff regexp.
Richard M. Stallman <rms@gnu.org>
parents:
8298
diff
changeset
|
3294 ;; Matches context difference listing |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3295 "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3296 ;; Matches unidiff difference listing |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3297 "\\(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
|
3298 ;; Matches reporter.el bug report |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3299 "^current state:\n==============\n" |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3300 ;; Matches commonly used "cut" boundaries |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3301 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|Environment Follows\\)") |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3302 "\\|") |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3303 "*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
|
3304 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
|
3305 Otherwise, it must be a function which is called to get the limit.") |
6138 | 3306 |
7606 | 3307 |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3308 (defun ispell-mime-multipartp (&optional limit) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3309 "Return multipart message start boundary or nil if none." |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3310 ;; caller must ensure `case-fold-search' is set to `t' |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3311 (and |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3312 (re-search-forward |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3313 "Content-Type: *multipart/\\([^ \t\n]*;[ \t]*[\n]?[ \t]*\\)+boundary=" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3314 limit t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3315 (let (boundary) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3316 (if (looking-at "\"") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3317 (let (start) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3318 (forward-char) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3319 (setq start (point)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3320 (while (not (looking-at "\"")) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3321 (forward-char 1)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3322 (setq boundary (buffer-substring-no-properties start (point)))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3323 (let ((start (point))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3324 (while (looking-at "[-0-9a-zA-Z'()+_,./:=?]") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3325 (forward-char)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3326 (setq boundary (buffer-substring-no-properties start (point))))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3327 (if (< (length boundary) 1) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3328 (setq boundary nil) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3329 (concat "--" boundary))))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3330 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3331 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3332 (defun ispell-mime-skip-part (boundary) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3333 "Moves point across header, or entire MIME part if message is encoded. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3334 All specified types except `7bit' `8bit' and `quoted-printable' are considered |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3335 encoded and therefore skipped. See rfc 1521, 2183, ... |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3336 If no boundary is given, then entire message is skipped. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3337 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3338 This starts one line ABOVE the MIME content messages, on the boundary marker, |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3339 for operation with the generic region-skipping code. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3340 This places new MIME boundaries into variable `ispell-checking-message'." |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3341 (forward-line) ; skip over boundary to headers |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3342 (let ((save-case-fold-search case-fold-search) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3343 (continuep t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3344 textp) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3345 (setq case-fold-search t |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3346 ispell-skip-html nil) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3347 (while continuep |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3348 (setq continuep nil) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3349 (if (looking-at "Content-Type: *text/") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3350 (progn |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3351 (goto-char (match-end 0)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3352 (if (looking-at "html") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3353 (setq ispell-skip-html t)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3354 (setq textp t |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3355 continuep t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3356 (re-search-forward "\\(.*;[ \t]*[\n]\\)*.*$" nil t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3357 (forward-line))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3358 (if (looking-at "Content-Transfer-Encoding: *\\([^ \t\n]*\\)") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3359 (let ((match (buffer-substring (match-beginning 1) (match-end 1)))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3360 (setq textp (member (upcase match) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3361 ;; only spell check the following encodings: |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3362 '("7BIT" "8BIT" "QUOTED-PRINTABLE" "BINARY")) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3363 continuep t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3364 (goto-char (match-end 0)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3365 (re-search-forward "\\(.*;[ \t]*[\n]\\)*.*$" nil t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3366 (forward-line))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3367 ;; hierarchical boundary definition |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3368 (if (looking-at "Content-Type: *multipart/") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3369 (let ((new-boundary (ispell-mime-multipartp))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3370 (if (string-match new-boundary boundary) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3371 (setq continuep t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3372 ;; first pass redefine skip function to include new boundary |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3373 ;;(re-search-backward boundary nil t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3374 (forward-line) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3375 (setq ispell-checking-message |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3376 (cons |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3377 (list new-boundary 'ispell-mime-skip-part new-boundary) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3378 (if (eq t ispell-checking-message) nil |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3379 ispell-checking-message)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3380 textp t |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3381 continuep t))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3382 ;; Skip all MIME headers that don't affect spelling |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3383 (if (looking-at "Content-[^ \t]*: *\\(.*;[ \t]*[\n]\\)*.*$") |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3384 (progn |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3385 (setq continuep t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3386 (goto-char (match-end 0)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3387 (forward-line))))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3388 |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3389 (setq case-fold-search save-case-fold-search) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3390 (if textp |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3391 (point) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3392 ;; encoded message. Skip to boundary, or entire message. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3393 (if (not boundary) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3394 (goto-char (point-max)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3395 (re-search-forward boundary nil t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3396 (beginning-of-line) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3397 (point))))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3398 |
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
3399 |
6138 | 3400 ;;;###autoload |
3401 (defun ispell-message () | |
3402 "Check the spelling of a mail message or news post. | |
3403 Don't check spelling of message headers except the Subject field. | |
3404 Don't check included messages. | |
3405 | |
15551
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
3406 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
|
3407 use the `x' command. (Any subsequent regions will be checked.) |
7607 | 3408 The `X' command aborts the message send so that you can edit the buffer. |
6138 | 3409 |
3410 To spell-check whenever a message is sent, include the appropriate lines | |
3411 in your .emacs file: | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3412 (add-hook 'message-send-hook 'ispell-message) ;; GNUS 5 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3413 (add-hook 'news-inews-hook 'ispell-message) ;; GNUS 4 |
6138 | 3414 (add-hook 'mail-send-hook 'ispell-message) |
3415 (add-hook 'mh-before-send-letter-hook 'ispell-message) | |
3416 | |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
3417 You can bind this to the key C-c i in GNUS or mail by adding to |
7607 | 3418 `news-reply-mode-hook' or `mail-mode-hook' the following lambda expression: |
6138 | 3419 (function (lambda () (local-set-key \"\\C-ci\" 'ispell-message)))" |
3420 (interactive) | |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3421 (save-excursion |
7606 | 3422 (goto-char (point-min)) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3423 (let* (boundary mimep |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3424 (ispell-skip-region-alist-save ispell-skip-region-alist) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3425 ;; 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
|
3426 ;; Non-nil marker of end of headers. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3427 (internal-messagep |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3428 (re-search-forward |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3429 (concat "^" (regexp-quote mail-header-separator) "$") nil t)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3430 (end-of-headers ; Start of body. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3431 (copy-marker |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3432 (or internal-messagep |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3433 (re-search-forward "^$" nil t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3434 (point-min)))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3435 (limit (copy-marker ; End of region we will spell check. |
7606 | 3436 (cond |
3437 ((not ispell-message-text-end) (point-max)) | |
3438 ((char-or-string-p ispell-message-text-end) | |
3439 (if (re-search-forward ispell-message-text-end nil t) | |
3440 (match-beginning 0) | |
3441 (point-max))) | |
3442 (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
|
3443 (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
|
3444 (if (and (boundp 'mail-yank-prefix) mail-yank-prefix) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3445 (ispell-non-empty-string mail-yank-prefix) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3446 " \\|\t")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3447 (cite-regexp ;Prefix of quoted text |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3448 (cond |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3449 ((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
|
3450 (concat "\\(" (sc-cite-regexp) "\\)" "\\|" |
57516
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
3451 (with-no-warnings |
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
3452 (ispell-non-empty-string sc-reference-tag-string)))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3453 ((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
|
3454 (concat "\\(" sc-cite-regexp "\\)" "\\|" |
57516
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
3455 (with-no-warnings |
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
3456 (ispell-non-empty-string sc-reference-tag-string)))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3457 ((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
|
3458 (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
|
3459 (concat "In article <" "\\|" |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3460 "[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|" |
57516
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
3461 (with-no-warnings message-cite-prefix-regexp) |
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
3462 "\\|" |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3463 default-prefix)) |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3464 ((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
|
3465 (concat "[^,;&+=\n]+ writes:" "\\|" |
57516
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
3466 (with-no-warnings |
3d3c9896482e
(ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
56932
diff
changeset
|
3467 (ispell-non-empty-string mh-ins-buf-prefix)))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3468 ((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
|
3469 (concat "In [a-zA-Z.]+ you write:" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3470 "In <[^,;&+=]+> [^,;&+=]+ writes:" "\\|" |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3471 " *> *")) |
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3472 ((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
|
3473 (concat "[^,;&+=\n]+ writes:" "\\|" |
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3474 (ispell-non-empty-string vm-included-text-prefix))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3475 (t default-prefix))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3476 (ispell-skip-region-alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3477 (cons (list (concat "^\\(" cite-regexp "\\)") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3478 (function forward-line)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3479 ispell-skip-region-alist)) |
7606 | 3480 (old-case-fold-search case-fold-search) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3481 (dictionary-alist ispell-message-dictionary-alist) |
7606 | 3482 (ispell-checking-message t)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3483 |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3484 ;; Select dictionary for message |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3485 (or (local-variable-p 'ispell-local-dictionary (current-buffer)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3486 (while dictionary-alist |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3487 (goto-char (point-min)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3488 (if (re-search-forward (car (car dictionary-alist)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3489 end-of-headers t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3490 (setq ispell-local-dictionary (cdr (car dictionary-alist)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3491 dictionary-alist nil) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3492 (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
|
3493 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3494 (unwind-protect |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3495 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3496 ;; Spell check any original Subject: |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3497 (goto-char (point-min)) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3498 (setq case-fold-search t |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3499 mimep (re-search-forward "MIME-Version:" end-of-headers t)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3500 (goto-char (point-min)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3501 (if (re-search-forward "^Subject: *" end-of-headers t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3502 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3503 (goto-char (match-end 0)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3504 (if (and (not (looking-at ".*Re\\>")) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3505 (not (looking-at "\\["))) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3506 (progn |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3507 (setq case-fold-search old-case-fold-search) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3508 (ispell-region (point) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3509 (progn ;Tab-initiated continuation lns. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3510 (end-of-line) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3511 (while (looking-at "\n[ \t]") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3512 (end-of-line 2)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3513 (point))))))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3514 (if mimep |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3515 (progn |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3516 (goto-char (point-min)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3517 (setq boundary (ispell-mime-multipartp end-of-headers)))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3518 ;; Adjust message limit to MIME message if necessary. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3519 (and boundary |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3520 (re-search-forward (concat boundary "--") nil t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3521 (re-search-backward boundary nil t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3522 (< (point) (marker-position limit)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3523 (set-marker limit (point))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3524 (goto-char (point-min)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3525 ;; Select type or skip checking if this is a non-multipart message |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3526 ;; Point moved to end of buffer if region is encoded. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3527 (if (and mimep (not boundary)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3528 (let (skip-regexp) ; protect from `ispell-mime-skip-part' |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3529 (goto-char (point-min)) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3530 (re-search-forward "Content-[^ \t]*:" end-of-headers t) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3531 (forward-line -1) ; following fn starts one line above |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3532 (ispell-mime-skip-part nil) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3533 ;; if message-text-end region, limit may be less than point. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3534 (if (> (point) limit) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3535 (set-marker limit (point))))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3536 (goto-char (max end-of-headers (point))) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3537 (forward-line 1) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3538 (setq case-fold-search old-case-fold-search) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3539 ;; Define MIME regions to skip. |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3540 (if boundary |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3541 (setq ispell-checking-message |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3542 (list (list boundary 'ispell-mime-skip-part boundary)))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3543 (ispell-region (point) limit)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3544 (set-marker end-of-headers nil) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3545 (set-marker limit nil) |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3546 (setq ispell-skip-region-alist ispell-skip-region-alist-save |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3547 ispell-skip-html nil |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3548 case-fold-search old-case-fold-search))))) |
7606 | 3549 |
6138 | 3550 |
3551 (defun ispell-non-empty-string (string) | |
3552 (if (or (not string) (string-equal string "")) | |
3553 "\\'\\`" ; An unmatchable string if string is null. | |
3554 (regexp-quote string))) | |
3555 | |
3556 | |
3557 ;;; ********************************************************************** | |
3558 ;;; Buffer Local Functions | |
3559 ;;; ********************************************************************** | |
3560 | |
3561 | |
3562 (defun ispell-accept-buffer-local-defs () | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3563 "Load all buffer-local information, restarting Ispell when necessary." |
6138 | 3564 (ispell-buffer-local-dict) ; May kill ispell-process. |
3565 (ispell-buffer-local-words) ; Will initialize ispell-process. | |
3566 (ispell-buffer-local-parsing)) | |
3567 | |
3568 | |
3569 (defun ispell-buffer-local-parsing () | |
7607 | 3570 "Place Ispell into parsing mode for this buffer. |
7606 | 3571 Overrides the default parsing mode. |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3572 Includes Latex/Nroff modes and extended character mode." |
6138 | 3573 ;; (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
|
3574 (ispell-send-string "!\n") ; Put process in terse mode. |
6138 | 3575 ;; 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
|
3576 ;; 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
|
3577 (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
|
3578 (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
|
3579 (string-match "[Tt][Ee][Xx]-mode" |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3580 (symbol-name major-mode))) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3581 (eq ispell-parser 'tex))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3582 (progn |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3583 (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
|
3584 (if (not (eq ispell-parser 'tex)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3585 (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
|
3586 (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
|
3587 ;; 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
|
3588 (if (and ispell-skip-html (not (eq ispell-skip-html t))) |
51151
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3589 (setq ispell-skip-html |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3590 (not (null (string-match "sgml\\|html\\|xml" |
fe11e703042b
Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50988
diff
changeset
|
3591 (downcase (symbol-name major-mode))))))) |
6138 | 3592 ;; Set default extended character mode for given buffer, if any. |
3593 (let ((extended-char-mode (ispell-get-extended-character-mode))) | |
3594 (if extended-char-mode | |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3595 (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
|
3596 ;; Set buffer-local parsing mode and extended character mode, if specified. |
6138 | 3597 (save-excursion |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3598 (goto-char (point-max)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3599 ;; Uses last occurrence of ispell-parsing-keyword |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3600 (if (search-backward ispell-parsing-keyword nil t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3601 (let ((end (save-excursion (end-of-line) (point))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3602 string) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3603 (search-forward ispell-parsing-keyword) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3604 (while (re-search-forward " *\\([^ \"]+\\)" end t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3605 ;; space separated definitions. |
63139
be61de52f953
(ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents:
62402
diff
changeset
|
3606 (setq string (downcase (match-string-no-properties 1))) |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3607 (cond ((and (string-match "latex-mode" string) |
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3608 (not (eq 'exclusive ispell-check-comments))) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3609 (ispell-send-string "+\n~tex\n")) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3610 ((string-match "nroff-mode" string) |
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3611 (ispell-send-string "-\n~nroff\n")) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3612 ((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
|
3613 (ispell-send-string (concat string "\n"))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3614 (t (message "Invalid Ispell Parsing argument!") |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3615 (sit-for 2)))))))) |
6138 | 3616 |
3617 | |
3618 ;;; Can kill the current ispell process | |
3619 | |
3620 (defun ispell-buffer-local-dict () | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3621 "Initializes local dictionary and local personal dictionary. |
6138 | 3622 When a dictionary is defined in the buffer (see variable |
7607 | 3623 `ispell-dictionary-keyword'), it will override the local setting |
6138 | 3624 from \\[ispell-change-dictionary]. |
3625 Both should not be used to define a buffer-local dictionary." | |
3626 (save-excursion | |
3627 (goto-char (point-min)) | |
3628 (let (end) | |
3629 ;; Override the local variable definition. | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3630 ;; Uses last occurrence of ispell-dictionary-keyword. |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3631 (goto-char (point-max)) |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
3632 (unless ispell-local-dictionary-overridden |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
3633 (if (search-backward ispell-dictionary-keyword nil t) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
3634 (progn |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
3635 (search-forward ispell-dictionary-keyword) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
3636 (setq end (save-excursion (end-of-line) (point))) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
3637 (if (re-search-forward " *\\([^ \"]+\\)" end t) |
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
3638 (setq ispell-local-dictionary |
63139
be61de52f953
(ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents:
62402
diff
changeset
|
3639 (match-string-no-properties 1)))))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3640 (goto-char (point-max)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3641 (if (search-backward ispell-pdict-keyword nil t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3642 (progn |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3643 (search-forward ispell-pdict-keyword) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3644 (setq end (save-excursion (end-of-line) (point))) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3645 (if (re-search-forward " *\\([^ \"]+\\)" end t) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3646 (setq ispell-local-pdict |
63139
be61de52f953
(ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents:
62402
diff
changeset
|
3647 (match-string-no-properties 1))))))) |
6138 | 3648 ;; Reload if new personal dictionary defined. |
3649 (if (and ispell-local-pdict | |
3650 (not (equal ispell-local-pdict ispell-personal-dictionary))) | |
3651 (progn | |
3652 (ispell-kill-ispell t) | |
3653 (setq ispell-personal-dictionary ispell-local-pdict))) | |
3654 ;; Reload if new dictionary defined. | |
59822
280d6b93af80
(ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents:
59723
diff
changeset
|
3655 (ispell-internal-change-dictionary)) |
6138 | 3656 |
3657 | |
3658 (defun ispell-buffer-local-words () | |
7607 | 3659 "Loads the buffer-local dictionary in the current buffer." |
6138 | 3660 (if (and ispell-buffer-local-name |
3661 (not (equal ispell-buffer-local-name (buffer-name)))) | |
3662 (progn | |
3663 (ispell-kill-ispell t) | |
3664 (setq ispell-buffer-local-name nil))) | |
3665 (ispell-init-process) | |
3666 (save-excursion | |
3667 (goto-char (point-min)) | |
3668 (while (search-forward ispell-words-keyword nil t) | |
3669 (or ispell-buffer-local-name | |
3670 (setq ispell-buffer-local-name (buffer-name))) | |
3671 (let ((end (save-excursion (end-of-line) (point))) | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3672 (ispell-casechars (ispell-get-casechars)) |
6138 | 3673 string) |
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
3674 ;; 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
|
3675 ;; 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
|
3676 (while (re-search-forward " *\\([^ ]+\\)" end t) |
63139
be61de52f953
(ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents:
62402
diff
changeset
|
3677 (setq string (match-string-no-properties 1)) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3678 ;; 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
|
3679 ;; 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
|
3680 (if (and (< 1 (length string)) |
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3681 (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
|
3682 (ispell-send-string (concat "@" string "\n")))))))) |
6138 | 3683 |
3684 | |
3685 ;;; returns optionally adjusted region-end-point. | |
3686 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3687 (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
|
3688 "Add WORD to the per-file word list." |
6138 | 3689 (or ispell-buffer-local-name |
3690 (setq ispell-buffer-local-name (buffer-name))) | |
3691 (save-excursion | |
3692 (goto-char (point-min)) | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3693 (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
|
3694 line-okay search done found) |
6138 | 3695 (while (not done) |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3696 (setq case-fold-search nil |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3697 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
|
3698 found (or found search) |
6138 | 3699 line-okay (< (+ (length word) 1 ; 1 for space after word.. |
3700 (progn (end-of-line) (current-column))) | |
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3701 80) |
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3702 case-fold-search old-case-fold-search) |
6138 | 3703 (if (or (and search line-okay) |
3704 (null search)) | |
3705 (progn | |
3706 (setq done t) | |
3707 (if (null search) | |
3708 (progn | |
3709 (open-line 1) | |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3710 (unless found (newline)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3711 (insert (concat comment-start " " ispell-words-keyword)) |
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3712 (if (> (length comment-end) 0) |
6138 | 3713 (save-excursion |
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3714 (newline) |
6138 | 3715 (insert comment-end))))) |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3716 (insert (concat " " word)))))))) |
6138 | 3717 |
29078 | 3718 (add-to-list 'debug-ignored-errors "^No word found to check!$") |
6138 | 3719 |
3720 (provide 'ispell) | |
3721 | |
3722 | |
3723 ;;; LOCAL VARIABLES AND BUFFER-LOCAL VALUE EXAMPLES. | |
3724 | |
3725 ;;; Local Variable options: | |
3726 ;;; mode: name(-mode) | |
3727 ;;; eval: expression | |
3728 ;;; local-variable: value | |
3729 | |
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3730 ;;; 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
|
3731 ;;; and spell checks only comments. |
6138 | 3732 |
3733 ;;; Local Variables: | |
3734 ;;; mode: emacs-lisp | |
3735 ;;; comment-column: 40 | |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3736 ;;; ispell-check-comments: exclusive |
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3737 ;;; ispell-local-dictionary: "american" |
6138 | 3738 ;;; End: |
3739 | |
3740 | |
3741 ;;; MORE EXAMPLES OF ISPELL BUFFER-LOCAL VALUES | |
3742 | |
3743 ;;; The following places this file in nroff parsing and extended char modes. | |
3744 ;;; Local IspellParsing: nroff-mode ~nroff | |
3745 ;;; Change IspellPersDict to IspellPersDict: to enable the following line. | |
3746 ;;; Local IspellPersDict ~/.ispell_lisp | |
3747 ;;; 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
|
3748 ; 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
|
3749 ; 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
|
3750 ; 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
|
3751 ; 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
|
3752 ; 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
|
3753 ; 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
|
3754 ; 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
|
3755 ; LocalWords: lns XEmacs HTML casechars Multibyte |
6138 | 3756 |
52401 | 3757 ;;; arch-tag: 4941b9f9-3b7c-4a76-a4ed-5fa8b6010ef5 |
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3758 ;;; ispell.el ends here |