Mercurial > emacs
annotate lisp/textmodes/ispell.el @ 37678:ebec0594dece
(compile-files): Redirect output of chmod to
/dev/null.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 11 May 2001 10:53:56 +0000 |
| parents | 931c07edd6e3 |
| children | b174db545cfd |
| rev | line source |
|---|---|
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1 ;;; ispell.el --- Interface to International Ispell Versions 3.1 and 3.2 |
| 13337 | 2 |
|
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
3 ;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. |
| 13337 | 4 |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
5 ;; Author: Ken Stevens <k.stevens@ieee.org> |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
6 ;; Maintainer: Ken Stevens <k.stevens@ieee.org> |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
7 ;; Stevens Mod Date: Fri Aug 4 09:41:50 PDT 2000 |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
8 ;; Stevens Revision: 3.4 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
9 ;; Status : Release with 3.1.12+ and 3.2.0+ ispell. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
10 ;; Bug Reports : ispell-el-bugs@itcorp.com |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
11 ;; Web Site : http://kdstevens.com/~stevens/ispell-page.html |
| 29208 | 12 ;; Keywords: unix wp |
| 13337 | 13 |
| 14169 | 14 ;; This file is part of GNU Emacs. |
| 13337 | 15 |
| 14169 | 16 ;; GNU Emacs is free software; you can redistribute it and/or modify |
| 17 ;; it under the terms of the GNU General Public License as published by | |
| 18 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 19 ;; any later version. | |
| 20 | |
| 21 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 22 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 23 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 24 ;; GNU General Public License for more details. | |
| 25 | |
| 26 ;; You should have received a copy of the GNU General Public License | |
| 27 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
| 28 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 29 ;; Boston, MA 02111-1307, USA. | |
| 30 | |
| 31 ;; Note: version numbers and time stamp are not updated | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
32 ;; when this file is edited for release with GNU emacs. |
| 14169 | 33 |
| 6138 | 34 ;;; Commentary: |
| 14169 | 35 |
| 36 ;; INSTRUCTIONS | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
37 |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
38 ;; This code contains a section of user-settable variables that you |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
39 ;; should inspect prior to installation. Look past the end of the history |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
40 ;; list. Set them up for your locale and the preferences of the majority |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
41 ;; of the users. Otherwise the users may need to set a number of variables |
| 14169 | 42 ;; themselves. |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
43 ;; You particularly may want to change the default dictionary for your |
| 14169 | 44 ;; country and language. |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
45 ;; Most dictionary changes should be made in this file so all users can |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
46 ;; enjoy them. Local or modified dictionaries are supported in your .emacs |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
47 ;; file. Modify the variable `ispell-local-dictionary-alist' to include |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
48 ;; these dictionaries, and they will be installed when ispell.el is loaded. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
49 |
| 14169 | 50 ;; Depending on the mail system you use, you may want to include these: |
| 51 ;; (add-hook 'news-inews-hook 'ispell-message) | |
| 52 ;; (add-hook 'mail-send-hook 'ispell-message) | |
| 53 ;; (add-hook 'mh-before-send-letter-hook 'ispell-message) | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
54 |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
55 ;; Ispell has a TeX parser and a nroff parser (the default). |
| 14169 | 56 ;; The parsing is controlled by the variable ispell-parser. Currently |
| 57 ;; it is just a "toggle" between TeX and nroff, but if more parsers are | |
| 58 ;; added it will be updated. See the variable description for more info. | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
59 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
60 |
| 14169 | 61 ;; TABLE OF CONTENTS |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
62 |
| 14169 | 63 ;; ispell-word |
| 64 ;; ispell-region | |
| 65 ;; ispell-buffer | |
| 66 ;; ispell-message | |
|
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
67 ;; ispell-comments-and-strings |
| 14169 | 68 ;; ispell-continue |
| 69 ;; ispell-complete-word | |
| 70 ;; ispell-complete-word-interior-frag | |
| 71 ;; ispell-change-dictionary | |
| 72 ;; ispell-kill-ispell | |
| 73 ;; ispell-pdict-save | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
74 ;; ispell-skip-region-alist |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
75 |
| 14169 | 76 ;; Commands in ispell-region: |
| 77 ;; Character replacement: Replace word with choice. May query-replace. | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
78 ;; ` ': Accept word this time. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
79 ;; `i': Accept word and insert into private dictionary. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
80 ;; `a': Accept word for this session. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
81 ;; `A': Accept word and place in buffer-local dictionary. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
82 ;; `r': Replace word with typed-in value. Rechecked. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
83 ;; `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
84 ;; `?': Show these commands |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
85 ;; `x': Exit spelling buffer. Move cursor to original point. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
86 ;; `X': Exit spelling buffer. Leaves cursor at the current point, and permits |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
87 ;; the check to be completed later. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
88 ;; `q': Quit spelling session (Kills ispell process). |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
89 ;; `l': Look up typed-in replacement in alternate dictionary. Wildcards okay. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
90 ;; `u': Like `i', but the word is lower-cased first. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
91 ;; `m': Place entered value in personal dictionary, then recheck current word. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
92 ;; `C-l': redraws screen |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
93 ;; `C-r': recursive edit |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
94 ;; `C-z': suspend emacs or iconify frame |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
95 |
| 14169 | 96 ;; Buffer-Local features: |
| 97 ;; There are a number of buffer-local features that can be used to customize | |
| 98 ;; ispell for the current buffer. This includes language dictionaries, | |
| 99 ;; personal dictionaries, parsing, and local word spellings. Each of these | |
| 100 ;; local customizations are done either through local variables, or by | |
| 101 ;; including the keyword and argument(s) at the end of the buffer (usually | |
| 102 ;; prefixed by the comment characters). See the end of this file for | |
| 103 ;; examples. The local keywords and variables are: | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
104 |
| 14169 | 105 ;; ispell-dictionary-keyword language-dictionary |
| 106 ;; uses local variable ispell-local-dictionary | |
| 107 ;; ispell-pdict-keyword personal-dictionary | |
| 108 ;; uses local variable ispell-local-pdict | |
| 109 ;; ispell-parsing-keyword mode-arg extended-char-arg | |
| 110 ;; ispell-words-keyword any number of local word spellings | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
111 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
112 ;; Region skipping: |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
113 ;; Place new regular expression definitions of regions you prefer not to |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
114 ;; spell check in `ispell-skip-region-alist'. Mode-dependent features can |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
115 ;; be added to latex by modifying `ispell-tex-skip-alists'. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
116 ;; `ispell-message' contains some custom skipping code for e-mail messages. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
117 |
| 14169 | 118 ;; BUGS: |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
119 ;; Need a way to select between different character mappings without separate |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
120 ;; dictionary entries. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
121 ;; Multi-byte characters if not defined by current dictionary may result in the |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
122 ;; evil "misalignment error" in some versions of MULE emacs. |
| 14169 | 123 ;; On some versions of emacs, growing the minibuffer fails. |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
124 ;; see `ispell-help-in-bufferp'. |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
125 ;; Recursive edits (?C-r or ?R) inside a keyboard text replacement check (?r) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
126 ;; can cause misalignment errors. |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
127 |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
128 ;; HISTORY |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
129 |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
130 ;; Modifications made in latest versions: |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
131 |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
132 ;; Revision 3.4 2000/8/4 09:41:50 kss |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
133 ;; Support new color display functions. |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
134 ;; Fixed misalignment offset bug when replacing a string after a shift made. |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
135 ;; Set to standard Author/Maintainer heading, |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
136 ;; ensure localwords lists are separated from the text by newline. (Dave Love) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
137 ;; Added dictionary definition for Italian (William Deakin) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
138 ;; HTML region skipping greatly improved. (Chuck D. Phillips) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
139 ;; improved menus. Fixed regexp matching http/email addresses. |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
140 ;; one arg always for xemacs sleep-for (gunnar Evermann) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
141 ;; support for synchronous processes (Eli Zaretskii) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
142 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
143 ;; Revision 3.3 1999/11/29 11:38:34 kss |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
144 ;; Only word replacements entered in from the keyboard are rechecked. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
145 ;; This fixes a bug in tex parsing and misalignment. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
146 ;; Exceptions exist for recursive edit and query-replace, with tex error |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
147 ;; condition tested. Recursive editing improved. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
148 ;; XEmacs repair for when `enable-multibyte-characters' defined - Didier Verna. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
149 ;; ispell-help fixed for XEmacs. Choices minibuffer now displayed in XEmacs. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
150 ;; Only list valid dictionaries in Spell menu. Russian dictionary doesn't allow |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
151 ;; run-together words, and uses koi8-r font. Don't skip text in html <TT> |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
152 ;; fonts. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
153 |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
154 ;; Revision 3.2 1999/5/7 14:25:14 kss |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
155 ;; Accept ispell versions 3.X.Y where X>=1 |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
156 ;; fine tuned latex region skipping. Fixed bug in ispell-word that did not |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
157 ;; point in right place on words < 2 chars. Simplified ispell-minor-mode. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
158 ;; Fixed bug in TeX parsing when math commands are in the comments. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
159 ;; Removed calls to `when' macro. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
160 |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
161 ;; Revision 3.1 1998/12/1 13:21:52 kss |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
162 ;; Improved and fixed customize support. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
163 ;; Improved and fixed comments in variables and messages. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
164 ;; A coding system is now required for all languages. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
165 ;; casechars improved for castellano, castellano8, and norsk dictionaries. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
166 ;; Dictionary norsk7-tex removed. Dictionary polish added. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
167 ;; Dictionaries redefined at load-time to support dictionary changes. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
168 ;; Menu redefined at load time to support dictionary changes. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
169 ;; ispell-check-version added as an alias for `check-ispell-version'. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
170 ;; Spelling suggestions returned in order generated by ispell. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
171 ;; Small bug fixed in matching ispell error messages. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
172 ;; Robustness added to ensure `case-fold-search' doesn't get redefined. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
173 ;; Fixed bug that didn't respect case of word in `ispell-complete-word'. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
174 ;; Multibyte character coding support added for process interactions. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
175 ;; Ensure ispell process has terminated before starting new process. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
176 ;; This can otherwise confuse process filters and hang ispell. |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
177 ;; Improved skipping support for SGML. |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
178 ;; Fixed bug using ^M rather than \r in `ispell-minor-check'. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
179 ;; Improved message reference matching in `ispell-message'. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
180 ;; Fixed bug in returning to nroff mode from tex mode. |
| 6138 | 181 |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
182 |
| 6138 | 183 ;;; Code: |
| 184 | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
185 ;;; Custom.el macros require recompiling this when they are not present. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
186 ;;; Add in backward compatible custom support. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
187 (eval-when-compile |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
188 (if (not (fboundp 'defcustom)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
189 (defmacro defcustom (symbol value doc &rest args) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
190 "Empty replacement for defcustom when not supplied." |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
191 `(defvar ,symbol ,value ,doc)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
192 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
193 (eval-when-compile |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
194 (if (fboundp 'defgroup) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
195 (defgroup ispell nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
196 "User variables for emacs ispell interface." |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
197 :group 'applications))) |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
198 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
199 (if (not (fboundp 'buffer-substring-no-properties)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
200 (defun buffer-substring-no-properties (start end) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
201 (buffer-substring start end))) |
| 6138 | 202 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
203 ;;;###autoload |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
204 (defconst xemacsp (string-match "Lucid\\|XEmacs" emacs-version) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
205 "Non nil if using XEmacs.") |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
206 |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
207 ;;;###autoload |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
208 (defconst version18p (string-match "18\\.[0-9]+\\.[0-9]+" emacs-version) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
209 "Non nil if using emacs version 18.") |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
210 |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
211 ;;;###autoload |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
212 (defconst version20p (string-match "20\\.[0-9]+\\.[0-9]+" emacs-version) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
213 "Non nil if using emacs version 20.") |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
214 |
|
30803
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
215 (defconst ispell-graphic-p |
|
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
216 (if (fboundp 'display-graphic-p) |
|
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
217 (display-graphic-p) |
|
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
218 xemacsp) |
|
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
219 "True if running on a `graphics capable' display.") |
|
a6e11bca863a
(ispell-graphic-p): New constant.
Miles Bader <miles@gnu.org>
parents:
30563
diff
changeset
|
220 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
221 (and (not version18p) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
222 (not (boundp 'epoch::version)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
223 (defalias 'ispell-check-version 'check-ispell-version)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
224 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
225 ;;; ********************************************************************** |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
226 ;;; 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
|
227 ;;; and location of binaries: |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
228 ;;; ********************************************************************** |
|
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 |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
231 ;;; ******* 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
|
232 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
233 (defcustom ispell-highlight-p 'block |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
234 "*Highlight spelling errors when non-nil. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
235 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
|
236 :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
|
237 :group 'ispell) |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
238 |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
239 (defcustom ispell-highlight-face 'highlight |
| 7607 | 240 "*The face used for Ispell highlighting. For Emacses with overlays. |
| 241 Possible values are `highlight', `modeline', `secondary-selection', | |
| 242 `region', and `underline'. | |
| 6138 | 243 This variable can be set by the user to whatever face they desire. |
| 244 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
|
245 slightly different." |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
246 :type 'face |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
247 :group 'ispell) |
| 6138 | 248 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
249 (defcustom ispell-check-comments t |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
250 "*Spelling of comments checked when non-nil. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
251 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
|
252 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
|
253 may produce undesired results." |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
254 :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
|
255 :group 'ispell) |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
256 |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
257 (defcustom ispell-query-replace-choices nil |
| 7606 | 258 "*Corrections made throughout region when non-nil. |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
259 Uses `query-replace' (\\[query-replace]) for corrections." |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
260 :type 'boolean |
|
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-skip-tib nil |
| 7607 | 264 "*Does not spell check `tib' bibliography references when non-nil. |
| 7606 | 265 Skips any text between strings matching regular expressions |
| 7607 | 266 `ispell-tib-ref-beginning' and `ispell-tib-ref-end'. |
| 6138 | 267 |
| 268 TeX users beware: Any field starting with [. will skip until a .] -- even | |
| 7607 | 269 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
|
270 a [.5mm] type of number...." |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
271 :type 'boolean |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
272 :group 'ispell) |
| 6138 | 273 |
| 274 (defvar ispell-tib-ref-beginning "[[<]\\." | |
| 275 "Regexp matching the beginning of a Tib reference.") | |
| 276 | |
| 277 (defvar ispell-tib-ref-end "\\.[]>]" | |
| 278 "Regexp matching the end of a Tib reference.") | |
| 279 | |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
280 (defcustom ispell-keep-choices-win t |
| 7607 | 281 "*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
|
282 This minimizes redisplay thrashing." |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
283 :type 'boolean |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
284 :group 'ispell) |
| 6138 | 285 |
|
32685
afd8474f34ae
(ispell-mode-line-window-height-fudge):
Miles Bader <miles@gnu.org>
parents:
30954
diff
changeset
|
286 (defcustom ispell-choices-win-default-height 2 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
287 "*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
|
288 Must be greater than 1." |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
289 :type 'integer |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
290 :group 'ispell) |
| 6138 | 291 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
292 (defcustom ispell-program-name "ispell" |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
293 "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
|
294 :type 'string |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
295 :group 'ispell) |
| 6138 | 296 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
297 (defcustom ispell-alternate-dictionary |
| 6138 | 298 (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
|
299 ((file-exists-p "/usr/share/dict/web2") "/usr/share/dict/web2") |
| 6138 | 300 ((file-exists-p "/usr/dict/words") "/usr/dict/words") |
| 301 ((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
|
302 ((file-exists-p "/usr/share/dict/words") "/usr/share/dict/words") |
| 6138 | 303 ((file-exists-p "/sys/dict") "/sys/dict") |
| 304 (t "/usr/dict/words")) | |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
305 "*Alternate dictionary for spelling help." |
|
24795
a7afe99e73cf
(ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents:
24737
diff
changeset
|
306 :type '(choice file (const :tag "None" nil)) |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
307 :group 'ispell) |
| 6138 | 308 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
309 (defcustom ispell-complete-word-dict ispell-alternate-dictionary |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
310 "*Dictionary used for word completion." |
|
24795
a7afe99e73cf
(ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents:
24737
diff
changeset
|
311 :type '(choice file (const :tag "None" nil)) |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
312 :group 'ispell) |
| 6138 | 313 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
314 (defcustom ispell-message-dictionary-alist nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
315 "*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
|
316 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
|
317 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
|
318 DICTIONARY if `ispell-local-dictionary' is not buffer-local. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
319 E.g. you may use the following value: |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
320 '((\"^Newsgroups:[ \\t]*de\\\\.\" . \"deutsch8\") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
321 (\"^To:[^\\n,]+\\\\.de[ \\t\\n,>]\" . \"deutsch8\"))" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
322 :type '(repeat (cons regexp string)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
323 :group 'ispell) |
| 6138 | 324 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
325 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
326 (defcustom ispell-grep-command "egrep" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
327 "Name of the grep command for search processes." |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
328 :type 'string |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
329 :group 'ispell) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
330 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
331 (defcustom ispell-grep-options "-i" |
| 7607 | 332 "String of options to use when running the program in `ispell-grep-command'. |
| 6138 | 333 Should probably be \"-i\" or \"-e\". |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
334 Some machines (like the NeXT) don't support \"-i\"" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
335 :type 'string |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
336 :group 'ispell) |
| 6138 | 337 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
338 (defcustom ispell-look-command |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
339 (cond ((file-exists-p "/bin/look") "/bin/look") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
340 ((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
|
341 ((file-exists-p "/usr/bin/look") "/usr/bin/look") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
342 (t "look")) |
| 6138 | 343 "Name of the look command for search processes. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
344 This must be an absolute file name." |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
345 :type 'file |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
346 :group 'ispell) |
| 6138 | 347 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
348 (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
|
349 "*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
|
350 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
|
351 :type 'boolean |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
352 :group 'ispell) |
| 6138 | 353 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
354 (defcustom ispell-have-new-look nil |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
355 "*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
|
356 :type 'boolean |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
357 :group 'ispell) |
| 6138 | 358 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
359 (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
|
360 "String of command options for `ispell-look-command'." |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
361 :type 'string |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
362 :group 'ispell) |
| 6138 | 363 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
364 (defcustom ispell-use-ptys-p nil |
| 7607 | 365 "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
|
366 When nil, Emacs uses pipes." |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
367 :type 'boolean |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
368 :group 'ispell) |
| 6138 | 369 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
370 (defcustom ispell-following-word nil |
| 7607 | 371 "*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
|
372 Otherwise `ispell-word' checks the preceding word." |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
373 :type 'boolean |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
374 :group 'ispell) |
| 6138 | 375 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
376 (defcustom ispell-help-in-bufferp nil |
| 7607 | 377 "*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
|
378 The following values are supported: |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
379 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
|
380 there for a couple of seconds. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
381 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
|
382 for a couple of seconds. |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
383 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
|
384 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
|
385 :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
|
386 :group 'ispell) |
| 6138 | 387 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
388 (defcustom ispell-quietly nil |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
389 "*Non-nil means suppress messages in `ispell-word'." |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
390 :type 'boolean |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
391 :group 'ispell) |
| 6138 | 392 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
393 (defcustom ispell-format-word (function upcase) |
| 7606 | 394 "*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
|
395 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
|
396 :type 'function |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
397 :group 'ispell) |
| 6138 | 398 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
399 (defcustom ispell-use-framepop-p nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
400 "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
|
401 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
|
402 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
|
403 (and window-system (condition-case () (require 'framepop) (error nil)))" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
404 :type 'boolean |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
405 :group 'ispell) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
406 |
|
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
407 ;;;###autoload |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
408 (defcustom ispell-personal-dictionary nil |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
409 "*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
|
410 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
|
411 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
|
412 :type '(choice file |
|
fa6f38bb8ac1
(ispell-personal-dictionary): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19785
diff
changeset
|
413 (const :tag "default" nil)) |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
414 :group 'ispell) |
| 6138 | 415 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
416 (defcustom ispell-silently-savep nil |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
417 "*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
|
418 :type 'boolean |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
419 :group 'ispell) |
| 6138 | 420 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
421 ;;; This is the local dictionary to use. When nil the default dictionary will |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
422 ;;; be used. Change set-default call to use a new default dictionary. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
423 (defcustom ispell-local-dictionary nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
424 "If non-nil, the dictionary to be used for Ispell commands. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
425 The value must be a string dictionary name in `ispell-dictionary-alist'. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
426 This variable becomes buffer-local when set in any fashion. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
427 |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
428 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
|
429 calling \\[ispell-change-dictionary] with that value. This variable |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
430 is automatically set when defined in the file with either |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
431 `ispell-dictionary-keyword' or the Local Variable syntax. |
| 6138 | 432 |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
433 To create a non-standard default dictionary (not from `ispell-dictionary-alist') |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
434 call function `set-default' with the new dictionary name." |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
435 :type '(choice string |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
436 (const :tag "default" nil)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
437 :group 'ispell) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
438 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
439 (make-variable-buffer-local 'ispell-local-dictionary) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
440 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
441 ;; Call this function set up the default dictionary if not English. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
442 ;;(set-default 'ispell-local-dictionary nil) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
443 |
| 6138 | 444 |
|
17378
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
445 (defcustom ispell-extra-args nil |
| 7607 | 446 "*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
|
447 For example, (\"-W\" \"3\") to cause it to accept all 1-3 character |
| 7606 | 448 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
|
449 for language-specific arguments." |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
450 :type '(repeat string) |
|
30a3a2b1260a
Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents:
17143
diff
changeset
|
451 :group 'ispell) |
| 7606 | 452 |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
453 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
454 |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
455 (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
|
456 "*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
|
457 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
|
458 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
|
459 buffer's major mode." |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
460 :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
|
461 (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
|
462 :group 'ispell) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
463 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
464 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
465 ;;; Define definitions here only for personal dictionaries. |
|
24737
4a18ef61578d
(ispell-local-dictionary-alist): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents:
24701
diff
changeset
|
466 ;;;###autoload |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
467 (defcustom ispell-local-dictionary-alist nil |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
468 "*Contains local or customized dictionary definitions. |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
469 See `ispell-dictionary-alist'." |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
470 :type '(repeat (list (choice :tag "Dictionary" |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
471 (string :tag "Dictionary name") |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
472 (const :tag "default" nil)) |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
473 (regexp :tag "Case characters") |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
474 (regexp :tag "Non case characters") |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
475 (regexp :tag "Other characters") |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
476 (boolean :tag "Many other characters") |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
477 (repeat :tag "Ispell command line args" |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
478 (string :tag "Arg")) |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
479 (choice :tag "Extended character mode" |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
480 (const "~tex") (const "~plaintex") |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
481 (const "~nroff") (const "~list") |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
482 (const "~latin1") (const "~latin3") |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
483 (const :tag "default" nil)) |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
484 (choice :tag "Character set" |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
485 (const iso-8859-1) |
|
24942
517194c6cdc6
(ispell-dictionary-alist-6): Change charset for Russian.
Richard M. Stallman <rms@gnu.org>
parents:
24795
diff
changeset
|
486 (const iso-8859-2) |
|
517194c6cdc6
(ispell-dictionary-alist-6): Change charset for Russian.
Richard M. Stallman <rms@gnu.org>
parents:
24795
diff
changeset
|
487 (const koi8-r)))) |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
488 :group 'ispell) |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
489 |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
490 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
491 ;;; 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
|
492 |
|
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
493 ;;; 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
|
494 ;;;###autoload |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
495 (setq |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
496 ispell-dictionary-alist-1 |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
497 '((nil ; default (English.aff) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
498 "[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
|
499 ("american" ; Yankee English |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
500 "[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
|
501 ("brasileiro" ; Brazilian mode |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
502 "[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
|
503 "[^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
|
504 "[']" nil ("-d" "brasileiro") nil iso-8859-1) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
505 ("british" ; British version |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
506 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B" "-d" "british") nil iso-8859-1) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
507 ("castellano" ; Spanish mode |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
508 "[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
|
509 "[^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
|
510 "[-]" nil ("-B" "-d" "castellano") "~tex" iso-8859-1) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
511 ("castellano8" ; 8 bit Spanish mode |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
512 "[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
|
513 "[^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
|
514 "[-]" 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
|
515 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
516 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
517 ;;; 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
|
518 ;;;###autoload |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
519 (setq |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
520 ispell-dictionary-alist-2 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
521 '(("czech" |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
522 "[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
|
523 "[^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
|
524 "" nil ("-B" "-d" "czech") nil iso-8859-2) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
525 ("dansk" ; Dansk.aff |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
526 "[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
|
527 "[']" nil ("-C") nil iso-8859-1) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
528 ("deutsch" ; Deutsch.aff |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
529 "[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
|
530 ("deutsch8" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
531 "[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
|
532 "[^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
|
533 "[']" 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
|
534 ("english" ; make English explicitly selectable |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
535 "[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
|
536 |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
537 |
|
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
538 ;;; 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
|
539 ;;;###autoload |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
540 (setq |
|
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
541 ispell-dictionary-alist-3 |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
542 '(("esperanto" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
543 "[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
|
544 "[^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
|
545 "[-']" t ("-C") "~latin3" iso-8859-1) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
546 ("esperanto-tex" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
547 "[A-Za-z^\\]" "[^A-Za-z^\\]" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
548 "[-'`\"]" 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
|
549 ("francais7" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
550 "[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
|
551 ("francais" ; Francais.aff |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
552 "[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
|
553 "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
554 "[-']" t nil "~list" iso-8859-1))) |
|
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
555 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
556 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
557 ;;; 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
|
558 ;;;###autoload |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
559 (setq |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
560 ispell-dictionary-alist-4 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
561 '(("francais-tex" ; Francais.aff |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
562 "[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
|
563 "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
564 "[-'^`\"]" t nil "~tex" iso-8859-1) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
565 ("italiano" ; Italian.aff |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
566 "[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
|
567 "[^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
|
568 "[-]" nil ("-B" "-d" "italian") "~tex" iso-8859-1) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
569 ("nederlands" ; Nederlands.aff |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
570 "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
571 "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
572 "[']" t ("-C") nil iso-8859-1) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
573 ("nederlands8" ; Dutch8.aff |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
574 "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
575 "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" |
|
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
576 "[']" t ("-C") nil iso-8859-1))) |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
577 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
578 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
579 ;;; Fifth part of dictionary, shortened for loaddefs.el |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
580 ;;;###autoload |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
581 (setq |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
582 ispell-dictionary-alist-5 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
583 '(("norsk" ; 8 bit Norwegian mode |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
584 "[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
|
585 "[^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
|
586 "[\"]" nil ("-d" "norsk") "~list" iso-8859-1) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
587 ("norsk7-tex" ; 7 bit Norwegian TeX mode |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
588 "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
589 "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
590 ("polish" ; polish mode |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
591 "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
592 "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" |
|
24468
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
593 "" nil ( "-d" "polish") nil iso-8859-2))) |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
594 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
595 |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
596 ;;; 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
|
597 ;;;###autoload |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
598 (setq |
|
381eed7518c2
(ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents:
24422
diff
changeset
|
599 ispell-dictionary-alist-6 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
600 ;; include Russian iso character set too? |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
601 ;; "[']" t ("-d" "russian") "~latin1" iso-8859-1 |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
602 '(("russian" ; Russian.aff (KOI8-R charset) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
603 "[\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
|
604 "[^\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]" |
|
25943
894de35cc296
(ispell-dictionary-alist-6): Don't use "-C" option for Russian.
Phillip Rulon <pjr@gnu.org>
parents:
24942
diff
changeset
|
605 "" nil ("-d" "russian") nil koi8-r) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
606 ("svenska" ; Swedish mode |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
607 "[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
|
608 "[^A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]" |
|
30945
97846db00c98
(ispell-dictionary-alist-6): Add `portugues'.
Gerd Moellmann <gerd@gnu.org>
parents:
30929
diff
changeset
|
609 "[']" nil ("-C") "~list" iso-8859-1) |
|
97846db00c98
(ispell-dictionary-alist-6): Add `portugues'.
Gerd Moellmann <gerd@gnu.org>
parents:
30929
diff
changeset
|
610 ("portugues" |
|
97846db00c98
(ispell-dictionary-alist-6): Add `portugues'.
Gerd Moellmann <gerd@gnu.org>
parents:
30929
diff
changeset
|
611 "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" |
|
97846db00c98
(ispell-dictionary-alist-6): Add `portugues'.
Gerd Moellmann <gerd@gnu.org>
parents:
30929
diff
changeset
|
612 "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" |
|
36815
f4c0144018d1
(ispell-dictionary-alist-6): Add support
Gerd Moellmann <gerd@gnu.org>
parents:
35221
diff
changeset
|
613 "[']" t ("-C" "-d" "portugues") "~latin1" iso-8859-1) |
|
f4c0144018d1
(ispell-dictionary-alist-6): Add support
Gerd Moellmann <gerd@gnu.org>
parents:
35221
diff
changeset
|
614 ("slovak" |
|
f4c0144018d1
(ispell-dictionary-alist-6): Add support
Gerd Moellmann <gerd@gnu.org>
parents:
35221
diff
changeset
|
615 "[A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" |
|
f4c0144018d1
(ispell-dictionary-alist-6): Add support
Gerd Moellmann <gerd@gnu.org>
parents:
35221
diff
changeset
|
616 "[^A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" |
|
f4c0144018d1
(ispell-dictionary-alist-6): Add support
Gerd Moellmann <gerd@gnu.org>
parents:
35221
diff
changeset
|
617 "" nil ("-B" "-d" "slovak") nil iso-8859-2))) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
618 |
|
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
619 ;;;###autoload |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
620 (defcustom ispell-dictionary-alist |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
621 (append ispell-local-dictionary-alist ; dictionary customizations |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
622 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
|
623 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
|
624 ispell-dictionary-alist-5 ispell-dictionary-alist-6) |
| 6138 | 625 "An alist of dictionaries and their associated parameters. |
| 626 | |
| 627 Each element of this list is also a list: | |
| 628 | |
| 7606 | 629 \(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
|
630 ISPELL-ARGS EXTENDED-CHARACTER-MODE CHARACTER-SET\) |
| 6138 | 631 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
632 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
|
633 nil means the default dictionary. |
| 6138 | 634 |
| 635 CASECHARS is a regular expression of valid characters that comprise a | |
| 636 word. | |
| 637 | |
| 638 NOT-CASECHARS is the opposite regexp of CASECHARS. | |
| 639 | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
640 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
|
641 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
|
642 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
|
643 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
|
644 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
|
645 \"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
|
646 \"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
|
647 If you want OTHERCHARS to be empty, use the empty string. |
| 6138 | 648 Hint: regexp syntax requires the hyphen to be declared first here. |
| 649 | |
|
19183
aaf5a3f7a2bd
(ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17955
diff
changeset
|
650 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
|
651 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
|
652 single word. |
| 6138 | 653 |
| 654 ISPELL-ARGS is a list of additional arguments passed to the ispell | |
| 655 subprocess. | |
| 656 | |
| 657 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
|
658 have been configured in an Ispell affix file. (For example, umlauts |
| 6138 | 659 can be encoded as \\\"a, a\\\", \"a, ...) Defaults are ~tex and ~nroff |
| 7607 | 660 in English. This has the same effect as the command-line `-T' option. |
| 661 The buffer Major Mode controls Ispell's parsing in tex or nroff mode, | |
| 6138 | 662 but the dictionary can control the extended character mode. |
| 663 Both defaults can be overruled in a buffer-local fashion. See | |
| 7607 | 664 `ispell-parsing-keyword' for details on this. |
| 6138 | 665 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
666 CHARACTER-SET used for languages with multibyte characters. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
667 |
| 6138 | 668 Note that the CASECHARS and OTHERCHARS slots of the alist should |
| 669 contain the same character set as casechars and otherchars in the | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
670 LANGUAGE.aff file \(e.g., english.aff\)." |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
671 :type '(repeat (list (choice :tag "Dictionary" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
672 (string :tag "Dictionary name") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
673 (const :tag "default" nil)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
674 (regexp :tag "Case characters") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
675 (regexp :tag "Non case characters") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
676 (regexp :tag "Other characters") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
677 (boolean :tag "Many other characters") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
678 (repeat :tag "Ispell command line args" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
679 (string :tag "Arg")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
680 (choice :tag "Extended character mode" |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
681 (const "~tex") (const "~plaintex") |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
682 (const "~nroff") (const "~list") |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
683 (const "~latin1") (const "~latin3") |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
684 (const :tag "default" nil)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
685 (choice :tag "Character set" |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
686 (const iso-8859-1) |
|
26442
797d877746e1
(ispell-dictionary-alist): Fix type by adding koi8-r
Gerd Moellmann <gerd@gnu.org>
parents:
25943
diff
changeset
|
687 (const iso-8859-2) |
|
797d877746e1
(ispell-dictionary-alist): Fix type by adding koi8-r
Gerd Moellmann <gerd@gnu.org>
parents:
25943
diff
changeset
|
688 (const koi8-r)))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
689 :group 'ispell) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
690 |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
691 ;;; update the dictionaries at load time |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
692 (setq ispell-dictionary-alist |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
693 (append ispell-local-dictionary-alist ; dictionary customizations |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
694 ispell-dictionary-alist-1 ispell-dictionary-alist-2 |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
695 ispell-dictionary-alist-3 ispell-dictionary-alist-4 |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
696 ispell-dictionary-alist-5 ispell-dictionary-alist-6)) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
697 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
698 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
699 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
700 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
701 ;;; ********************************************************************** |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
702 ;;; 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
|
703 ;;; ********************************************************************** |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
704 |
| 6138 | 705 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
706 |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
707 ;;; 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
|
708 ;;; 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
|
709 (defconst ispell-required-version '(3 1 12) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
710 "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
|
711 (defvar ispell-offset -1 |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
712 "Offset that maps protocol differences between ispell 3.1 versions.") |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
713 |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
714 (defconst ispell-version "ispell.el 3.4 -- Fri Aug 4 09:41:50 PDT 2000") |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
715 |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
716 |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
717 (defun check-ispell-version (&optional interactivep) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
718 "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
|
719 Returns version number if called interactively. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
720 Otherwise returns the library path if defined." |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
721 ;; 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
|
722 ;; 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
|
723 ;; 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
|
724 ;; 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
|
725 ;; 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
|
726 ;; 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
|
727 ;; themselves on startup. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
728 (interactive "p") |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
729 (let ((case-fold-search-val case-fold-search) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
730 ;; avoid bugs when syntax of `.' changes in various default modes |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
731 (default-major-mode 'fundamental-mode) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
732 result status) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
733 (save-excursion |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
734 (set-buffer (get-buffer-create " *ispell-tmp*")) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
735 (erase-buffer) |
| 34632 | 736 (setq status (call-process |
| 737 ispell-program-name nil t nil | |
| 738 ;; aspell doesn't accept the -vv switch. | |
| 739 (let ((case-fold-search | |
| 740 (memq system-type '(ms-dos windows-nt))) | |
| 741 (speller | |
| 742 (file-name-nondirectory ispell-program-name))) | |
| 743 ;; Assume anything that isn't `aspell' is Ispell. | |
| 744 (if (string-match "\\`aspell" speller) "-v" "-vv")))) | |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
745 (goto-char (point-min)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
746 (if interactivep |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
747 (progn |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
748 (end-of-line) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
749 (setq result (concat (buffer-substring-no-properties (point-min) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
750 (point)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
751 ", " |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
752 ispell-version)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
753 (message result)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
754 ;; return library path. |
|
34131
63a3259e1b50
(check-ispell-version): Don't use match-beginning
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33353
diff
changeset
|
755 (if (re-search-forward "LIBDIR = \\\"\\([^ \t\n]*\\)\\\"" nil t) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
756 (setq result (buffer-substring (match-beginning 1) (match-end 1))))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
757 (goto-char (point-min)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
758 (if (not (memq status '(0 nil))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
759 (error "%s exited with %s %s" ispell-program-name |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
760 (if (stringp status) "signal" "code") status)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
761 (setq case-fold-search t |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
762 status (re-search-forward |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
763 (concat "\\<\\(" |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
764 (format "%d" (car ispell-required-version)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
765 "\\)\\.\\([0-9]*\\)\\.\\([0-9]*\\)\\>") |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
766 nil t) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
767 case-fold-search case-fold-search-val) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
768 (if (or (not status) ; major version mismatch |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
769 (< (car (read-from-string (buffer-substring-no-properties |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
770 (match-beginning 2) (match-end 2)))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
771 (car (cdr ispell-required-version)))) ; minor version mismatch |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
772 (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
|
773 ispell-program-name (car ispell-required-version) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
774 (car (cdr ispell-required-version)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
775 (car (cdr (cdr ispell-required-version)))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
776 ;; check that it is the correct version. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
777 (if (and (= (car (read-from-string (buffer-substring-no-properties |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
778 (match-beginning 2)(match-end 2)))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
779 (car (cdr ispell-required-version))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
780 (< (car (read-from-string (buffer-substring-no-properties |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
781 (match-beginning 3)(match-end 3)))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
782 (car (cdr (cdr ispell-required-version))))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
783 (setq ispell-offset 0))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
784 (kill-buffer (current-buffer))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
785 result)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
786 |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
787 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
788 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
789 ;;; 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
|
790 ;;; 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
|
791 ;;; 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
|
792 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
793 |
|
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
794 ;;;###autoload |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
795 (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
|
796 ;;; redo menu when loading ispell to get dictionary modifications |
| 23847 | 797 (setq ispell-menu-map nil) |
| 6138 | 798 |
|
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
799 ;;;###autoload |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
800 (defvar ispell-menu-xemacs nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
801 "Spelling menu for XEmacs. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
802 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
|
803 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
|
804 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
805 ;;; 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
|
806 ;;; 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
|
807 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
808 ;;; Set up dictionary |
|
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
809 ;;;###autoload |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
810 (defvar ispell-menu-map-needed |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
811 ;; 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
|
812 (and (not ispell-menu-map) |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
813 (not version18p) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
814 (not xemacsp) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
815 'reload)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
816 |
|
33353
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
817 (defvar ispell-library-path (if (or (not (fboundp 'byte-compiling-files-p)) |
|
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
818 (not (byte-compiling-files-p))) |
|
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
819 (check-ispell-version)) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
820 "The directory where ispell dictionaries reside.") |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
821 |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
822 (defvar ispell-process nil |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
823 "The process object for Ispell.") |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
824 |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
825 (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
|
826 (fboundp 'process-send-string) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
827 (fboundp 'accept-process-output) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
828 ;;(fboundp 'start-process) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
829 ;;(fboundp 'set-process-filter) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
830 ;;(fboundp 'process-kill-without-query) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
831 ) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
832 "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
|
833 |
|
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
834 ;;;###autoload |
|
33349
b8015b527f27
(ispell-library-path): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
32685
diff
changeset
|
835 (if (and ispell-menu-map-needed |
|
33353
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
836 (or (not (fboundp 'byte-compiling-files-p)) |
|
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
837 (not (byte-compiling-files-p)))) |
|
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
838 (let ((dicts (reverse (cons (cons "default" nil) ispell-dictionary-alist))) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
839 ;; `ispell-library-path' intentionally not defined in autoload |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
840 (path (and (boundp 'ispell-library-path) ispell-library-path)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
841 name load-dict) |
|
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
842 (setq ispell-menu-map (make-sparse-keymap "Spell")) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
843 ;; add the dictionaries to the bottom of the list. |
|
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
844 (while dicts |
|
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
845 (setq name (car (car dicts)) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
846 load-dict (car (cdr (member "-d" (nth 5 (car dicts))))) |
|
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
847 dicts (cdr dicts)) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
848 (cond ((not (stringp name)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
849 (define-key ispell-menu-map (vector 'default) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
850 (cons "Select Default Dict" |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
851 (cons "Dictionary for which Ispell was configured" |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
852 (list 'lambda () '(interactive) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
853 (list |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
854 'ispell-change-dictionary "default")))))) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
855 ((or (not path) ; load all if library dir not defined |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
856 (file-exists-p (concat path "/" name ".hash")) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
857 (file-exists-p (concat path "/" name ".has")) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
858 (and load-dict |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
859 (or (file-exists-p(concat path "/" load-dict ".hash")) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
860 (file-exists-p(concat path "/" load-dict ".has"))))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
861 (define-key ispell-menu-map (vector (intern name)) |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
862 (cons (concat "Select " (capitalize name) " Dict") |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
863 (list 'lambda () '(interactive) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
864 (list 'ispell-change-dictionary name))))))))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
865 |
|
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
866 |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
867 ;;; 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
|
868 ;;;###autoload |
|
33349
b8015b527f27
(ispell-library-path): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
32685
diff
changeset
|
869 (if (and ispell-menu-map-needed |
|
33353
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
870 (or (not (fboundp 'byte-compiling-files-p)) |
|
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
871 (not (byte-compiling-files-p)))) |
|
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
872 (progn |
|
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
873 (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
|
874 '(menu-item "Change Dictionary..." ispell-change-dictionary |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
875 :help "Supply explicit path to dictionary")) |
|
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
876 (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
|
877 '(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
|
878 :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
|
879 (eq (ispell-process-status) 'run)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
880 :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
|
881 (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
|
882 '(menu-item "Save Dictionary" |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
883 (lambda () (interactive) (ispell-pdict-save t t)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
884 :help "Save personal dictionary")) |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
885 (define-key ispell-menu-map [ispell-help] |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
886 ;; 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
|
887 '(menu-item "Help" |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
888 (lambda () (interactive) (describe-function 'ispell-help)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
889 :help "Show standard Ispell keybindings and commands")) |
|
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
890 (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
|
891 '(menu-item "Complete Word" ispell-complete-word |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
892 :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
|
893 (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
|
894 '(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
|
895 :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
|
896 |
|
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
897 ;;;###autoload |
|
33349
b8015b527f27
(ispell-library-path): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
32685
diff
changeset
|
898 (if (and ispell-menu-map-needed |
|
33353
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
899 (or (not (fboundp 'byte-compiling-files-p)) |
|
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
900 (not (byte-compiling-files-p)))) |
|
7890
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
901 (progn |
|
e6e305453f19
(ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents:
7840
diff
changeset
|
902 (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
|
903 '(menu-item "Continue Spell-Checking" ispell-continue |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
904 :enable (and (boundp 'ispell-region-end) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
905 (marker-position ispell-region-end) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
906 (equal (marker-buffer ispell-region-end) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
907 (current-buffer))) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
908 :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
|
909 (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
|
910 '(menu-item "Spell-Check Word" ispell-word |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
911 :help "Spell-check word at cursor")) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
912 (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
|
913 '(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
|
914 :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
|
915 |
|
12277
e03c2446f198
Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
12260
diff
changeset
|
916 ;;;###autoload |
|
33349
b8015b527f27
(ispell-library-path): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
32685
diff
changeset
|
917 (if (and ispell-menu-map-needed |
|
33353
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
918 (or (not (fboundp 'byte-compiling-files-p)) |
|
efc926d28bd3
(toplevel): Use byte-compiling-files-p
Gerd Moellmann <gerd@gnu.org>
parents:
33349
diff
changeset
|
919 (not (byte-compiling-files-p)))) |
|
8725
e4e6dc1e1be8
Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents:
8676
diff
changeset
|
920 (progn |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
921 (define-key ispell-menu-map [ispell-region] |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
922 '(menu-item "Spell-Check Region" ispell-region |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
923 :enable mark-active |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
924 :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
|
925 (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
|
926 '(menu-item "Spell-Check Message" ispell-message |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
927 :help "Skip headers and included message text")) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
928 (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
|
929 '(menu-item "Spell-Check Buffer" ispell-buffer |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
930 :help "Check spelling of selected buffer")) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
931 ;;(put 'ispell-region 'menu-enable 'mark-active) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
932 (fset 'ispell-menu-map (symbol-value 'ispell-menu-map)))) |
| 7606 | 933 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
934 ;;; XEmacs versions 19 & 20 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
935 (if (and xemacsp |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
936 (not version18p) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
937 (featurep 'menubar) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
938 (null ispell-menu-xemacs) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
939 (not (and (boundp 'infodock-version) infodock-version))) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
940 (let ((dicts (cons (cons "default" nil) ispell-dictionary-alist)) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
941 (current-menubar (or current-menubar default-menubar)) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
942 (menu |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
943 '(["Help" (describe-function 'ispell-help) t] |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
944 ;;["Help" (popup-menu ispell-help-list) t] |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
945 ["Check Message" ispell-message t] |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
946 ["Check Buffer" ispell-buffer t] |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
947 ["Check Comments" ispell-comments-and-strings t] |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
948 ["Check Word" ispell-word t] |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
949 ["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
|
950 ["Continue Check" ispell-continue t] |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
951 ["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
|
952 ["Complete Word" ispell-complete-word t] |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
953 ["Kill Process" ispell-kill-ispell t] |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
954 "-" |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
955 ["Save Personal Dict"(ispell-pdict-save t t) t] |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
956 ["Change Dictionary" ispell-change-dictionary t] |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
957 ["Select Default" (ispell-change-dictionary "default") t])) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
958 name load-dict) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
959 (while dicts |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
960 (setq name (car (car dicts)) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
961 load-dict (car (cdr (member "-d" (nth 5 (car dicts))))) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
962 dicts (cdr dicts)) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
963 ;; Include if the dictionary is in the library, or path not defined. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
964 (if (and (stringp name) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
965 (or (not ispell-library-path) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
966 (file-exists-p (concat ispell-library-path "/" |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
967 name ".hash")) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
968 (file-exists-p (concat ispell-library-path "/" |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
969 name ".has")) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
970 (and load-dict |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
971 (or (file-exists-p (concat ispell-library-path "/" |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
972 load-dict ".hash")) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
973 (file-exists-p (concat ispell-library-path "/" |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
974 load-dict ".has")))))) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
975 (setq menu (append menu |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
976 (list |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
977 (vector (concat "Select " (capitalize name)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
978 (list 'ispell-change-dictionary name) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
979 t)))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
980 (setq ispell-menu-xemacs menu) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
981 (if current-menubar |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
982 (progn |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
983 (delete-menu-item '("Edit" "Spell")) ; in case already defined |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
984 (add-menu '("Edit") "Spell" ispell-menu-xemacs))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
985 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
986 ;;; Allow incrementing characters as integers in XEmacs 20 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
987 (if (and xemacsp |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
988 (fboundp 'int-char)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
989 (fset 'ispell-int-char 'int-char) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
990 ;; Emacs and XEmacs 19 or earlier |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
991 (fset 'ispell-int-char 'identity)) |
| 6138 | 992 |
| 993 | |
| 994 ;;; ********************************************************************** | |
| 995 | |
| 996 | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
997 ;;; This variable contains the current dictionary being used if the ispell |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
998 ;;; process is running. Otherwise it contains the global default. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
999 (defvar ispell-dictionary nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1000 "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
|
1001 When `ispell-local-dictionary' is nil, `ispell-dictionary' is used to select |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1002 the dictionary for new buffers. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1003 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1004 This is passed to the ispell process using the `-d' switch and is |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1005 used as key in `ispell-dictionary-alist' (which see).") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1006 |
|
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1007 (defun ispell-decode-string (str) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1008 "Decodes multibyte character strings. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1009 Protects against bogus binding of `enable-multibyte-characters' in XEmacs." |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1010 (if (and (or xemacsp |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1011 (and (boundp 'enable-multibyte-characters) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1012 enable-multibyte-characters)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1013 (fboundp 'decode-coding-string) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1014 (ispell-get-coding-system)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1015 (decode-coding-string str (ispell-get-coding-system)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1016 str)) |
|
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1017 |
| 6138 | 1018 (defun ispell-get-casechars () |
|
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1019 (ispell-decode-string |
|
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1020 (nth 1 (assoc ispell-dictionary ispell-dictionary-alist)))) |
| 6138 | 1021 (defun ispell-get-not-casechars () |
|
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1022 (ispell-decode-string |
|
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1023 (nth 2 (assoc ispell-dictionary ispell-dictionary-alist)))) |
| 6138 | 1024 (defun ispell-get-otherchars () |
|
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1025 (ispell-decode-string |
|
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1026 (nth 3 (assoc ispell-dictionary ispell-dictionary-alist)))) |
| 6138 | 1027 (defun ispell-get-many-otherchars-p () |
| 1028 (nth 4 (assoc ispell-dictionary ispell-dictionary-alist))) | |
| 1029 (defun ispell-get-ispell-args () | |
| 1030 (nth 5 (assoc ispell-dictionary ispell-dictionary-alist))) | |
| 1031 (defun ispell-get-extended-character-mode () | |
| 1032 (nth 6 (assoc ispell-dictionary ispell-dictionary-alist))) | |
|
19644
f0c278dad88e
(ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents:
19183
diff
changeset
|
1033 (defun ispell-get-coding-system () |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1034 (nth 7 (assoc ispell-dictionary ispell-dictionary-alist))) |
| 6138 | 1035 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1036 |
| 6138 | 1037 (defvar ispell-pdict-modified-p nil |
| 7607 | 1038 "Non-nil means personal dictionary has modifications to be saved.") |
| 6138 | 1039 |
| 1040 ;;; 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
|
1041 ;;; When non-nil, the spell session is terminated. |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1042 ;;; When numeric, contains cursor location in buffer, and cursor remains there. |
| 7607 | 1043 (defvar ispell-quit nil) |
| 6138 | 1044 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1045 (defvar ispell-process-directory nil |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1046 "The directory where `ispell-process' was started.") |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1047 |
| 6138 | 1048 (defvar ispell-filter nil |
| 7607 | 1049 "Output filter from piped calls to Ispell.") |
| 6138 | 1050 |
| 1051 (defvar ispell-filter-continue nil | |
| 7607 | 1052 "Control variable for Ispell filter function.") |
| 6138 | 1053 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1054 (defvar ispell-output-buffer nil |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1055 "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
|
1056 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1057 (defvar ispell-session-buffer nil |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1058 "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
|
1059 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1060 (defvar ispell-cmd-args nil |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1061 "Command-line arguments to pass to a synchronous Ispell subprocess.") |
| 6138 | 1062 |
| 1063 (defvar ispell-query-replace-marker (make-marker) | |
| 7607 | 1064 "Marker for `query-replace' processing.") |
| 6138 | 1065 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1066 (defvar ispell-recursive-edit-marker (make-marker) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1067 "Marker for return point from recursive edit.") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1068 |
| 6138 | 1069 (defvar ispell-checking-message nil |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1070 "Non-nil when we're checking a mail message.") |
| 6138 | 1071 |
| 1072 (defconst ispell-choices-buffer "*Choices*") | |
| 1073 | |
| 7607 | 1074 (defvar ispell-overlay nil "Overlay variable for Ispell highlighting.") |
| 6138 | 1075 |
| 1076 ;;; *** Buffer Local Definitions *** | |
| 1077 | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1078 (defconst ispell-words-keyword "LocalWords: " |
| 6138 | 1079 "The keyword for local oddly-spelled words to accept. |
| 1080 The keyword will be followed by any number of local word spellings. | |
| 1081 There can be multiple of these keywords in the file.") | |
| 1082 | |
| 1083 (defconst ispell-dictionary-keyword "Local IspellDict: " | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1084 "The keyword for a local dictionary to use. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1085 The keyword must be followed by a correct dictionary name in |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1086 `ispell-dictionary-alist'. When multiple occurrences exist, the last keyword |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1087 definition is used.") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1088 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1089 (defconst ispell-pdict-keyword "Local IspellPersDict: " |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1090 "The keyword for defining buffer local dictionaries. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1091 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
|
1092 The last occurring definition in the buffer will be used.") |
| 6138 | 1093 |
| 1094 (defconst ispell-parsing-keyword "Local IspellParsing: " | |
| 7607 | 1095 "The keyword for overriding default Ispell parsing. |
| 6138 | 1096 The above keyword string should be followed by `latex-mode' or |
| 1097 `nroff-mode' to put the current buffer into the desired parsing mode. | |
| 1098 | |
| 1099 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
|
1100 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
|
1101 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
|
1102 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1103 ;;;###autoload |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1104 (defvar ispell-skip-region-alist |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1105 '((ispell-words-keyword forward-line) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1106 (ispell-dictionary-keyword forward-line) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1107 (ispell-pdict-keyword forward-line) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1108 (ispell-parsing-keyword forward-line) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1109 ("^---*BEGIN PGP [A-Z ]*--*" . "^---*END PGP [A-Z ]*--*") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1110 ("^---* \\(Start of \\)?[Ff]orwarded [Mm]essage" . "^---* End of [Ff]orwarded [Mm]essage") |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1111 ;; 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
|
1112 ;; pattern necessary for performance reasons when `-' part of word syntax. |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1113 ("\\(-+\\|\\(/\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+\\)") |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1114 ;; 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
|
1115 ;; "\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+" |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1116 ;; 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
|
1117 ;; 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
|
1118 ;; 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
|
1119 ;; 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
|
1120 ;; "\\(\\w\\|[-_]\\)+[.:@]\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+" |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1121 ) |
| 22529 | 1122 "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
|
1123 The alist key must be a regular expression. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1124 Valid forms include: |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1125 (KEY) - just skip the key. |
| 22529 | 1126 (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
|
1127 (KEY REGEXP) - skip to end of REGEXP. REGEXP must be a string. |
| 22529 | 1128 (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
|
1129 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1130 |
| 6138 | 1131 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1132 ;;;###autoload |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1133 (defvar ispell-tex-skip-alists |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1134 '((;;("%\\[" . "%\\]") ; AMStex block comment... |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1135 ;; 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
|
1136 ;; \cite, \hspace, \hspace*, \hyphenation, \include, \includeonly, \input, |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1137 ;; \label, \nocite, \rule (in ispell - rest included here) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1138 ("\\\\addcontentsline" ispell-tex-arg-end 2) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1139 ("\\\\add\\(tocontents\\|vspace\\)" ispell-tex-arg-end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1140 ("\\\\\\([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
|
1141 ;;("\\\\author" ispell-tex-arg-end) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1142 ("\\\\bibliographystyle" ispell-tex-arg-end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1143 ("\\\\makebox" ispell-tex-arg-end 0) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1144 ("\\\\e?psfig" ispell-tex-arg-end) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1145 ("\\\\document\\(class\\|style\\)" . |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1146 "\\\\begin[ \t\n]*{[ \t\n]*document[ \t\n]*}")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1147 (;; delimited with \begin. In ispell: displaymath, eqnarray, eqnarray*, |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1148 ;; equation, minipage, picture, tabular, tabular* (ispell) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1149 ("\\(figure\\|table\\)\\*?" ispell-tex-arg-end 0) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1150 ("list" ispell-tex-arg-end 2) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1151 ("program" . "\\\\end[ \t\n]*{[ \t\n]*program[ \t\n]*}") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1152 ("verbatim\\*?" . "\\\\end[ \t\n]*{[ \t\n]*verbatim\\*?[ \t\n]*}"))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1153 "*Lists of regions to be skipped in TeX mode. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1154 First list is used raw. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1155 Second list has key placed inside \\begin{}. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1156 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1157 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
|
1158 for skipping in latex mode.") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1159 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1160 |
| 6138 | 1161 (defvar ispell-local-pdict ispell-personal-dictionary |
| 7606 | 1162 "A buffer local variable containing the current personal dictionary. |
| 7607 | 1163 If non-nil, the value must be a string, which is a file name. |
| 1164 | |
| 1165 If you specify a personal dictionary for the current buffer which is | |
| 1166 different from the current personal dictionary, the effect is similar | |
| 7606 | 1167 to calling \\[ispell-change-dictionary]. This variable is automatically |
| 7607 | 1168 set when defined in the file with either `ispell-pdict-keyword' or the |
| 1169 local variable syntax.") | |
| 6138 | 1170 |
| 1171 (make-variable-buffer-local 'ispell-local-pdict) | |
| 1172 | |
| 1173 (defvar ispell-buffer-local-name nil | |
| 1174 "Contains the buffer name if local word definitions were used. | |
| 1175 Ispell is then restarted because the local words could conflict.") | |
| 1176 | |
| 1177 (defvar ispell-parser 'use-mode-name | |
| 1178 "*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
|
1179 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
|
1180 Default parser is `nroff'. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1181 Currently the only other valid parser is `tex'. |
| 6138 | 1182 |
| 1183 You can set this variable in hooks in your init file -- eg: | |
| 1184 | |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1185 (add-hook 'tex-mode-hook (function (lambda () (setq ispell-parser 'tex))))") |
| 6138 | 1186 |
| 1187 (defvar ispell-region-end (make-marker) | |
| 1188 "Marker that allows spelling continuations.") | |
| 1189 | |
|
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
1190 (defvar ispell-check-only nil |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
1191 "If non-nil, `ispell-word' does not try to correct the word.") |
| 6138 | 1192 |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1193 |
| 6138 | 1194 ;;; ********************************************************************** |
| 1195 ;;; ********************************************************************** | |
| 1196 | |
| 1197 | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1198 |
|
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1199 ;;;###autoload |
|
21989
d6cca4865f58
(ispell-word): Make M-$ binding using esc-map.
Richard M. Stallman <rms@gnu.org>
parents:
21873
diff
changeset
|
1200 (define-key esc-map "$" 'ispell-word) |
| 6839 | 1201 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1202 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1203 (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
|
1204 "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
|
1205 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
|
1206 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
|
1207 (if ispell-async-processp |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1208 (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
|
1209 (if (null ispell-process) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1210 (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
|
1211 (let ((buf ispell-output-buffer) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1212 ispell-output) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1213 (if (not (bufferp buf)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1214 (setq ispell-filter nil) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1215 (save-excursion |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1216 (set-buffer buf) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1217 (setq ispell-output (buffer-substring-no-properties |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1218 (point-min) (point-max)))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1219 (ispell-filter t ispell-output) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1220 (save-excursion |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1221 (set-buffer buf) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1222 (erase-buffer))))))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1223 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1224 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1225 (defun ispell-send-string (string) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1226 "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
|
1227 (if ispell-async-processp |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1228 (process-send-string ispell-process string) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1229 ;; 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
|
1230 ;; 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
|
1231 ;; 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
|
1232 ;; 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
|
1233 ;; 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
|
1234 (let ((cmd (aref string 0)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1235 ;; The following commands are not passed to Ispell until |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1236 ;; we have a *reall* reason to invoke it. |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1237 (cmds-to-defer '(?* ?@ ?~ ?+ ?- ?! ?%)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1238 (default-major-mode 'fundamental-mode) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1239 (session-buf ispell-session-buffer) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1240 (output-buf ispell-output-buffer) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1241 (ispell-args ispell-cmd-args) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1242 (defdir ispell-process-directory) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1243 prev-pos) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1244 (save-excursion |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1245 (set-buffer session-buf) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1246 (setq prev-pos (point)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1247 (setq default-directory defdir) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1248 (insert string) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1249 (if (not (memq cmd cmds-to-defer)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1250 (let (coding-system-for-read coding-system-for-write status) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1251 (if (or xemacsp |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1252 (and (boundp 'enable-multibyte-characters) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1253 enable-multibyte-characters)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1254 (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
|
1255 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
|
1256 (set-buffer output-buf) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1257 (erase-buffer) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1258 (set-buffer session-buf) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1259 (setq status |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1260 (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
|
1261 ispell-program-name nil |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1262 output-buf nil |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1263 "-a" "-m" ispell-args)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1264 (set-buffer output-buf) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1265 (goto-char (point-min)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1266 (save-match-data |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1267 (if (not (looking-at "@(#) ")) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1268 (error "Ispell error: %s" |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1269 (buffer-substring-no-properties |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1270 (point) (progn (end-of-line) (point))))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1271 ;; 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
|
1272 ;; 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
|
1273 ;; 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
|
1274 ;; `ispell-filter'. |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1275 (or (string= string "\032\n") |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1276 (progn |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1277 (forward-line) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1278 (delete-region (point-min) (point)))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1279 ;; 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
|
1280 ;; 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
|
1281 ;; 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
|
1282 ;; 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
|
1283 ;; the personal dictionary. |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1284 (set-buffer session-buf) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1285 (delete-region prev-pos (point)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1286 ;; Ispell run synchronously saves the personal dictionary |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1287 ;; 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
|
1288 ;; 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
|
1289 ;; dictionary. |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1290 (if (memq status '(0 nil)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1291 (let ((more-lines t)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1292 (goto-char (point-min)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1293 (while more-lines |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1294 (if (looking-at "^\\*") |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1295 (let ((start (point))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1296 (forward-line) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1297 (delete-region start (point))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1298 (setq more-lines (= 0 (forward-line)))))))))))))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1299 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1300 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1301 |
| 6138 | 1302 ;;;###autoload |
|
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1303 (defun ispell-word (&optional following quietly continue) |
| 6138 | 1304 "Check spelling of word under or before the cursor. |
| 7607 | 1305 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
|
1306 in a window allowing you to choose one. |
| 7607 | 1307 |
| 7606 | 1308 If optional argument FOLLOWING is non-nil or if `ispell-following-word' |
| 6138 | 1309 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
|
1310 \(rather than preceding\) is checked when the cursor is not over a word. |
| 7606 | 1311 When the optional argument QUIETLY is non-nil or `ispell-quietly' is non-nil |
| 6138 | 1312 when called interactively, non-corrective messages are suppressed. |
| 1313 | |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
1314 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
|
1315 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
|
1316 |
| 7606 | 1317 Word syntax described by `ispell-dictionary-alist' (which see). |
| 6138 | 1318 |
| 1319 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
|
1320 or \\[ispell-region] to update the Ispell process. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1321 |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1322 return values: |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1323 nil word is correct or spelling is accpeted. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1324 0 word is inserted into buffer-local definitions. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1325 \"word\" word corrected from word list. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1326 \(\"word\" arg\) word is hand entered. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1327 quit spell session exited." |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1328 |
|
7585
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1329 (interactive (list nil nil current-prefix-arg)) |
|
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1330 (if continue |
|
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1331 (ispell-continue) |
|
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1332 (if (interactive-p) |
|
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1333 (setq following ispell-following-word |
|
64976da3fb8a
(ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents:
7014
diff
changeset
|
1334 quietly ispell-quietly)) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1335 (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
|
1336 (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
|
1337 (word (ispell-get-word following)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1338 start end poss new-word replace) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1339 ;; De-structure return word info list. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1340 (setq start (car (cdr word)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1341 end (car (cdr (cdr word))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1342 word (car word)) |
| 6138 | 1343 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1344 ;; now check spelling of word if it has 3 or more characters. |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1345 (cond |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1346 ((> (length word) 2) |
|
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1347 (or quietly |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1348 (message "Checking spelling of %s..." |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1349 (funcall ispell-format-word word))) |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1350 (ispell-send-string "%\n") ; put in verbose mode |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1351 (ispell-send-string (concat "^" word "\n")) |
|
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1352 ;; wait until ispell has processed word |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1353 (while (progn |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1354 (ispell-accept-output) |
|
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1355 (not (string= "" (car ispell-filter))))) |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1356 ;;(ispell-send-string "!\n") ;back to terse mode. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1357 (setq ispell-filter (cdr ispell-filter)) ; remove extra \n |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1358 (if (and ispell-filter (listp ispell-filter)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1359 (if (> (length ispell-filter) 1) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1360 (error "Ispell and its process have different character maps.") |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1361 (setq poss (ispell-parse-output (car ispell-filter))))) |
|
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1362 (cond ((eq poss t) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1363 (or quietly |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1364 (message "%s is correct" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1365 (funcall ispell-format-word word)))) |
|
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1366 ((stringp poss) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1367 (or quietly |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1368 (message "%s is correct because of root %s" |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1369 (funcall ispell-format-word word) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1370 (funcall ispell-format-word poss)))) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1371 ((null poss) (message "Error in ispell process")) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1372 (ispell-check-only ; called from ispell minor mode. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1373 (beep) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1374 (message "%s is incorrect" (funcall ispell-format-word word))) |
|
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1375 (t ; prompt for correct word. |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1376 (save-window-excursion |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1377 (setq replace (ispell-command-loop |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1378 (car (cdr (cdr poss))) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1379 (car (cdr (cdr (cdr poss)))) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1380 (car poss) start end))) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1381 (cond ((equal 0 replace) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1382 (ispell-add-per-file-word-list (car poss))) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1383 (replace |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1384 (setq new-word (if (atom replace) replace (car replace)) |
|
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1385 cursor-location (+ (- (length word) (- end start)) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1386 cursor-location)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1387 (if (not (equal new-word (car poss))) |
|
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1388 (progn |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1389 (delete-region start end) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1390 (setq start (point)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1391 (insert new-word) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1392 (setq end (point)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1393 (if (not (atom replace)) ;recheck spelling of replacement |
|
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1394 (progn |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1395 (if (car (cdr replace)) ; query replace requested |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1396 (save-window-excursion |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1397 (query-replace word new-word t))) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1398 (goto-char start) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1399 ;; single word could be split into multiple words |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1400 (setq ispell-quit (not (ispell-region start end))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1401 )))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1402 ;; keep if rechecking word and we keep choices win. |
|
21592
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1403 (if (get-buffer ispell-choices-buffer) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1404 (kill-buffer ispell-choices-buffer)))) |
|
47b8415a9976
(ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents:
21591
diff
changeset
|
1405 (ispell-pdict-save ispell-silently-savep) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1406 ;; NB: Cancels ispell-quit incorrectly if called from ispell-region |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1407 (if ispell-quit (setq ispell-quit nil replace 'quit)))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1408 (goto-char cursor-location) ; return to original location |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1409 replace))) |
| 6138 | 1410 |
| 1411 | |
| 1412 (defun ispell-get-word (following &optional extra-otherchars) | |
| 1413 "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
|
1414 If optional argument FOLLOWING is non-nil or if `ispell-following-word' |
| 6138 | 1415 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
|
1416 \(rather than preceding\) is checked when the cursor is not over a word. |
| 7606 | 1417 Optional second argument contains otherchars that can be included in word |
| 6138 | 1418 many times. |
| 1419 | |
| 7606 | 1420 Word syntax described by `ispell-dictionary-alist' (which see)." |
| 6138 | 1421 (let* ((ispell-casechars (ispell-get-casechars)) |
| 1422 (ispell-not-casechars (ispell-get-not-casechars)) | |
| 1423 (ispell-otherchars (ispell-get-otherchars)) | |
| 1424 (ispell-many-otherchars-p (ispell-get-many-otherchars-p)) | |
| 1425 (word-regexp (concat ispell-casechars | |
| 1426 "+\\(" | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1427 (if (not (string= "" ispell-otherchars)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1428 (concat ispell-otherchars "?")) |
| 6138 | 1429 (if extra-otherchars |
| 1430 (concat extra-otherchars "?")) | |
| 1431 ispell-casechars | |
| 1432 "+\\)" | |
| 1433 (if (or ispell-many-otherchars-p | |
| 1434 extra-otherchars) | |
| 1435 "*" "?"))) | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1436 did-it-once prevpt |
| 6138 | 1437 start end word) |
| 1438 ;; find the word | |
| 1439 (if (not (looking-at ispell-casechars)) | |
| 1440 (if following | |
| 1441 (re-search-forward ispell-casechars (point-max) t) | |
| 1442 (re-search-backward ispell-casechars (point-min) t))) | |
| 1443 ;; move to front of word | |
| 1444 (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
|
1445 (while (and (or (and (not (string= "" ispell-otherchars)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1446 (looking-at ispell-otherchars)) |
| 6138 | 1447 (and extra-otherchars (looking-at extra-otherchars))) |
| 1448 (not (bobp)) | |
| 1449 (or (not did-it-once) | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1450 ispell-many-otherchars-p) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1451 (not (eq prevpt (point)))) |
| 6138 | 1452 (if (and extra-otherchars (looking-at extra-otherchars)) |
| 1453 (progn | |
| 1454 (backward-char 1) | |
| 1455 (if (looking-at ispell-casechars) | |
| 1456 (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
|
1457 (setq did-it-once t |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1458 prevpt (point)) |
| 6138 | 1459 (backward-char 1) |
| 1460 (if (looking-at ispell-casechars) | |
| 1461 (re-search-backward ispell-not-casechars (point-min) 'move) | |
| 1462 (backward-char -1)))) | |
| 1463 ;; 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
|
1464 (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
|
1465 (if ispell-check-only |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1466 ;; 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
|
1467 (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
|
1468 (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
|
1469 (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
|
1470 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
|
1471 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
|
1472 (list word start end)))) |
| 6138 | 1473 |
| 1474 | |
| 1475 ;;; Global ispell-pdict-modified-p is set by ispell-command-loop and | |
| 1476 ;;; tracks changes in the dictionary. The global may either be | |
| 1477 ;;; a value or a list, whose value is the state of whether the | |
| 1478 ;;; dictionary needs to be saved. | |
| 1479 | |
| 37426 | 1480 ;;;###autoload |
| 6138 | 1481 (defun ispell-pdict-save (&optional no-query force-save) |
| 1482 "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
|
1483 If so, ask if it needs to be saved." |
| 6138 | 1484 (interactive (list ispell-silently-savep t)) |
| 1485 (if (and ispell-pdict-modified-p (listp ispell-pdict-modified-p)) | |
| 1486 (setq ispell-pdict-modified-p (car ispell-pdict-modified-p))) | |
| 1487 (if (or ispell-pdict-modified-p force-save) | |
| 1488 (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
|
1489 (progn |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1490 (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
|
1491 (message "Personal dictionary saved.")))) |
| 6138 | 1492 ;; unassert variable, even if not saved to avoid questioning. |
| 1493 (setq ispell-pdict-modified-p nil)) | |
| 1494 | |
| 1495 | |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1496 (defun ispell-command-loop (miss guess word start end) |
| 6138 | 1497 "Display possible corrections from list MISS. |
| 1498 GUESS lists possibly valid affix construction of WORD. | |
| 1499 Returns nil to keep word. | |
| 7606 | 1500 Returns 0 to insert locally into buffer-local dictionary. |
| 1501 Returns string for new chosen word. | |
| 1502 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
|
1503 Query-replace when list length is 2. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1504 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
|
1505 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
|
1506 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
|
1507 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
|
1508 used. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1509 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
|
1510 (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
|
1511 (line ispell-choices-win-default-height) |
|
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1512 ;; ensure 4 context lines. |
|
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1513 (max-lines (- (ispell-adjusted-window-height) 4)) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1514 (choices miss) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1515 (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
|
1516 ispell-choices-win-default-height)) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1517 (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
|
1518 (dedicated (window-dedicated-p (selected-window))) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1519 (skipped 0) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1520 char num result textwin dedicated-win) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1521 |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1522 ;; setup the *Choices* buffer with valid data. |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1523 (save-excursion |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1524 (set-buffer (get-buffer-create ispell-choices-buffer)) |
|
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1525 (setq mode-line-format (concat "-- %b -- word: " word)) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1526 ;; XEmacs: prevent thick modeline vs increasing height in overlay-window |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1527 ;;(and (fboundp 'set-specifier) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1528 ;; (set-specifier has-modeline-p (cons (current-buffer) nil))) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1529 (erase-buffer) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1530 (if guess |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1531 (progn |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1532 (insert "Affix rules generate and capitalize " |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1533 "this word as shown below:\n\t") |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1534 (while guess |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1535 (if (> (+ 4 (current-column) (length (car guess))) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1536 (window-width)) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1537 (progn |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1538 (insert "\n\t") |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1539 (setq line (1+ line)))) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1540 (insert (car guess) " ") |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1541 (setq guess (cdr guess))) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1542 (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
|
1543 " from the derivative root.\n") |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1544 (setq line (+ line (if choices 3 2))))) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1545 (while (and choices |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1546 (< (if (> (+ 7 (current-column) (length (car choices)) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1547 (if (> count ?~) 3 0)) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1548 (window-width)) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1549 (progn |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1550 (insert "\n") |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1551 (setq line (1+ line))) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1552 line) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1553 max-lines)) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1554 ;; 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
|
1555 ;; 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
|
1556 (while (memq count command-characters) ; skip command characters. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1557 (setq count (ispell-int-char (1+ count)) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1558 skipped (1+ skipped))) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1559 (insert "(" count ") " (car choices) " ") |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1560 (setq choices (cdr choices) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1561 count (ispell-int-char (1+ count)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1562 (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
|
1563 |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1564 ;; ensure word is visible |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1565 (if (not (pos-visible-in-window-p end)) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1566 (sit-for 0)) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1567 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1568 ;; allow temporary split of dedicated windows... |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1569 (if dedicated |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1570 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1571 (setq dedicated-win (selected-window)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1572 (set-window-dedicated-p dedicated-win nil))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1573 |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1574 ;; Display choices for misspelled word. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1575 (ispell-show-choices line end) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1576 (select-window (setq textwin (next-window))) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1577 |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1578 ;; highlight word, protecting current buffer status |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1579 (unwind-protect |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1580 (progn |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1581 (and ispell-highlight-p |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1582 (ispell-highlight-spelling-error start end t)) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1583 ;; Loop until a valid choice is made. |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1584 (while |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1585 (eq |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1586 t |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1587 (setq |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1588 result |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1589 (progn |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1590 (undo-boundary) |
|
17143
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1591 (let (message-log-max) |
|
df636f296adf
(ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents:
16762
diff
changeset
|
1592 (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
|
1593 "unchanged, Character to replace word"))) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1594 (let ((inhibit-quit t)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1595 (setq char (if (fboundp 'read-char-exclusive) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1596 (read-char-exclusive) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1597 (read-char)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1598 skipped 0) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1599 (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
|
1600 (setq char ?X |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1601 quit-flag nil))) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1602 ;; Adjust num to array offset skipping command characters. |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1603 (let ((com-chars command-characters)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1604 (while com-chars |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1605 (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
|
1606 (setq skipped (1+ skipped))) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1607 (setq com-chars (cdr com-chars))) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1608 (setq num (- char ?0 skipped))) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1609 |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1610 (cond |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1611 ((= char ? ) nil) ; accept word this time only |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1612 ((= 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
|
1613 (ispell-send-string (concat "*" word "\n")) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1614 (setq ispell-pdict-modified-p '(t)) ; dictionary modified! |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1615 nil) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1616 ((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
|
1617 (ispell-send-string (concat "@" word "\n")) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1618 (if (null ispell-pdict-modified-p) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1619 (setq ispell-pdict-modified-p |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1620 (list ispell-pdict-modified-p))) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1621 (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
|
1622 ((or (= char ?r) (= char ?R)) ; type in replacement |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1623 (and (eq 'block ispell-highlight-p) ; refresh tty's |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1624 (ispell-highlight-spelling-error start end nil t)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1625 (let ((result |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1626 (if (or (= char ?R) ispell-query-replace-choices) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1627 (list (read-string |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1628 (format "Query-replacement for %s: "word) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1629 word) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1630 t) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1631 (cons (read-string "Replacement for: " word) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1632 nil)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1633 (and (eq 'block ispell-highlight-p) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1634 (ispell-highlight-spelling-error start end nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1635 'block)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1636 result)) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1637 ((or (= char ??) (= char help-char) (= char ?\C-h)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1638 (and (eq 'block ispell-highlight-p) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1639 (ispell-highlight-spelling-error start end nil t)) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1640 (ispell-help) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1641 (and (eq 'block ispell-highlight-p) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1642 (ispell-highlight-spelling-error start end nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1643 'block)) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1644 t) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1645 ;; Quit and move point back. |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1646 ((= char ?x) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1647 (ispell-pdict-save ispell-silently-savep) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1648 (message "Exited spell-checking") |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1649 (setq ispell-quit t) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1650 nil) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1651 ;; Quit and preserve point. |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1652 ((= char ?X) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1653 (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
|
1654 (message "%s" |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1655 (substitute-command-keys |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1656 (concat "Spell-checking suspended;" |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1657 " use C-u \\[ispell-word] to resume"))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1658 (setq ispell-quit start) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1659 nil) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1660 ((= char ?q) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1661 (if (y-or-n-p "Really kill Ispell process? ") |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1662 (progn |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1663 (ispell-kill-ispell t) ; terminate process. |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1664 (setq ispell-quit (or (not ispell-checking-message) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1665 (point)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1666 ispell-pdict-modified-p nil)) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1667 t)) ; continue if they don't quit. |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1668 ((= char ?l) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1669 (and (eq 'block ispell-highlight-p) ; refresh tty displays |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1670 (ispell-highlight-spelling-error start end nil t)) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1671 (let ((new-word (read-string |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1672 "Lookup string (`*' is wildcard): " |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1673 word))) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1674 (if new-word |
| 6138 | 1675 (progn |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1676 (save-excursion |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1677 (set-buffer (get-buffer-create |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1678 ispell-choices-buffer)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1679 (erase-buffer) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1680 (setq count ?0 |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1681 skipped 0 |
|
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1682 mode-line-format (concat |
|
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1683 "-- %b -- word: " |
|
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
1684 new-word) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1685 miss (lookup-words new-word) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1686 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
|
1687 line ispell-choices-win-default-height) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1688 (while (and choices ; adjust choices window. |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1689 (< (if (> (+ 7 (current-column) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1690 (length (car choices)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1691 (if (> count ?~) 3 0)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1692 (window-width)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1693 (progn |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1694 (insert "\n") |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1695 (setq line (1+ line))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1696 line) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1697 max-lines)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1698 (while (memq count command-characters) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1699 (setq count (ispell-int-char (1+ count)) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1700 skipped (1+ skipped))) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1701 (insert "(" count ") " (car choices) " ") |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1702 (setq choices (cdr choices) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1703 count (ispell-int-char (1+ count)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1704 (setq count (ispell-int-char |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1705 (- count ?0 skipped)))) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1706 (ispell-show-choices line end) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1707 (select-window (next-window))))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1708 (and (eq 'block ispell-highlight-p) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1709 (ispell-highlight-spelling-error start end nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1710 'block)) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1711 t) ; reselect from new choices |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
1712 ((= char ?u) ; insert lowercase into dictionary |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1713 (ispell-send-string (concat "*" (downcase word) "\n")) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1714 (setq ispell-pdict-modified-p '(t)) ; dictionary modified! |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1715 nil) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1716 ((= 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
|
1717 (ispell-send-string |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1718 (concat "*" (read-string "Insert: " word) "\n")) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1719 (setq ispell-pdict-modified-p '(t)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1720 (cons word nil)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1721 ((and (>= num 0) (< num count)) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1722 (if ispell-query-replace-choices ; Query replace flag |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1723 (list (nth num miss) 'query-replace) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1724 (nth num miss))) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1725 ((= char ?\C-l) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1726 (redraw-display) t) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1727 ((= char ?\C-r) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1728 ;; 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
|
1729 (if (marker-position ispell-recursive-edit-marker) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1730 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1731 (message "Only one recursive edit session supported") |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1732 (beep) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1733 (sit-for 2)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1734 (set-marker ispell-recursive-edit-marker start) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1735 ;;(set-marker ispell-region-end reg-end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1736 (and ispell-highlight-p ; unhighlight |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1737 (ispell-highlight-spelling-error start end)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1738 (unwind-protect |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1739 (progn |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1740 (message |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1741 "%s" |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1742 (substitute-command-keys |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1743 (concat "Exit recursive edit with" |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1744 " \\[exit-recursive-edit]"))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1745 (save-window-excursion (save-excursion |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1746 (recursive-edit)))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1747 ;; protected |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1748 (goto-char ispell-recursive-edit-marker) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1749 (if (not (equal (marker-buffer |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1750 ispell-recursive-edit-marker) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1751 (current-buffer))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1752 (progn |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1753 (set-marker ispell-recursive-edit-marker nil) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1754 (error |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1755 "Cannot continue ispell from this buffer."))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1756 (set-marker ispell-recursive-edit-marker nil))) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1757 (list word nil)) ; recheck starting at this word. |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1758 ((= char ?\C-z) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1759 (funcall (key-binding "\C-z")) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1760 t) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1761 (t (ding) t)))))) |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
1762 result) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
1763 ;; protected |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1764 (and ispell-highlight-p ; unhighlight |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1765 (save-window-excursion |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1766 (select-window textwin) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1767 (ispell-highlight-spelling-error start end))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1768 (if dedicated |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1769 (set-window-dedicated-p dedicated-win t))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1770 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1771 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1772 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1773 (defun ispell-show-choices (line end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1774 "Shows the choices in another buffer or frame." |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1775 (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
|
1776 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1777 (framepop-display-buffer (get-buffer ispell-choices-buffer)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1778 (get-buffer-window ispell-choices-buffer t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1779 (select-window (previous-window))) ; *Choices* window |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1780 ;; 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
|
1781 (let ((choices-window (get-buffer-window ispell-choices-buffer))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1782 (if choices-window |
|
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1783 (if (= line (ispell-adjusted-window-height choices-window)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1784 (select-window choices-window) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1785 ;; *Choices* window changed size. Adjust the choices window |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1786 ;; without scrolling the spelled window when possible |
|
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1787 (let ((window-line |
|
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1788 (- line (ispell-adjusted-window-height choices-window))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1789 (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
|
1790 (if (< line ispell-choices-win-default-height) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1791 (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
|
1792 (- ispell-choices-win-default-height |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1793 line)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1794 (move-to-window-line 0) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1795 (vertical-motion window-line) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1796 (set-window-start (selected-window) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1797 (if (> (point) visible) visible (point))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1798 (goto-char end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1799 (select-window (previous-window)) ; *Choices* window |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1800 (enlarge-window window-line))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1801 ;; 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
|
1802 (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
|
1803 (switch-to-buffer ispell-choices-buffer) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1804 (goto-char (point-min))))) |
| 6138 | 1805 |
| 1806 | |
|
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
1807 ;;;###autoload |
| 6138 | 1808 (defun ispell-help () |
|
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1809 "Display a list of the options available when a misspelling is encountered. |
| 6138 | 1810 |
| 1811 Selections are: | |
| 1812 | |
| 1813 DIGIT: Replace the word with a digit offered in the *Choices* buffer. | |
| 7607 | 1814 SPC: Accept word this time. |
| 1815 `i': Accept word and insert into private dictionary. | |
| 1816 `a': Accept word for this session. | |
| 1817 `A': Accept word and place in `buffer-local dictionary'. | |
| 1818 `r': Replace word with typed-in value. Rechecked. | |
| 1819 `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. | |
| 1820 `?': Show these commands. | |
| 1821 `x': Exit spelling buffer. Move cursor to original point. | |
| 1822 `X': Exit spelling buffer. Leaves cursor at the current point, and permits | |
| 6138 | 1823 the aborted check to be completed later. |
| 7607 | 1824 `q': Quit spelling session (Kills ispell process). |
| 1825 `l': Look up typed-in replacement in alternate dictionary. Wildcards okay. | |
| 1826 `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
|
1827 `m': Place typed-in value in personal dictionary, then recheck current word. |
| 7607 | 1828 `C-l': redraws screen |
| 1829 `C-r': recursive edit | |
| 1830 `C-z': suspend emacs or iconify frame" | |
| 6138 | 1831 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1832 (if (equal ispell-help-in-bufferp 'electric) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1833 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1834 (require 'ehelp) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
1835 (with-electric-help |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1836 (function (lambda () |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1837 ;;This shouldn't be necessary: with-electric-help needs |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1838 ;; an optional argument telling it about the smallest |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1839 ;; acceptable window-height of the help buffer. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1840 (if (< (window-height) 15) |
|
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1841 (enlarge-window |
|
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
1842 (- 15 (ispell-adjusted-window-height)))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1843 (princ "Selections are: |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1844 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1845 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
|
1846 SPC: Accept word this time. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1847 `i': Accept word and insert into private dictionary. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1848 `a': Accept word for this session. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1849 `A': Accept word and place in `buffer-local dictionary'. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1850 `r': Replace word with typed-in value. Rechecked. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1851 `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
|
1852 `?': Show these commands. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1853 `x': Exit spelling buffer. Move cursor to original point. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1854 `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
|
1855 the aborted check to be completed later. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1856 `q': Quit spelling session (Kills ispell process). |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1857 `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
|
1858 `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
|
1859 `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
|
1860 `C-l': redraws screen |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1861 `C-r': recursive edit |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1862 `C-z': suspend emacs or iconify frame") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1863 nil ;undocumented requirement of with-electric-help |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1864 )))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1865 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1866 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1867 (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
|
1868 "[i]nsert into private dictionary")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1869 (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
|
1870 "e[x/X]it; [q]uit session")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1871 (help-3 (concat "[u]ncapitalized insert into dict. " |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1872 "Type 'x C-h d ispell-help' for more help"))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1873 (save-window-excursion |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1874 (if ispell-help-in-bufferp |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1875 (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
|
1876 (ispell-overlay-window 4) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1877 (switch-to-buffer (get-buffer-create "*Ispell Help*")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1878 (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
|
1879 (sit-for 5) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1880 (kill-buffer "*Ispell Help*")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1881 (select-window (minibuffer-window)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1882 (erase-buffer) |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
1883 (if (not version18p) (message nil)) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1884 ;;(set-minibuffer-window (selected-window)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1885 (enlarge-window 2) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
1886 (insert (concat help-1 "\n" help-2 "\n" help-3)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1887 (sit-for 5) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1888 (erase-buffer)))))) |
| 6138 | 1889 |
| 1890 | |
| 1891 (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
|
1892 "Look up WORD in optional word-list dictionary LOOKUP-DICT. |
| 7606 | 1893 A `*' serves as a wild card. If no wild cards, `look' is used if it exists. |
| 1894 Otherwise the variable `ispell-grep-command' contains the command used to | |
| 1895 search for the words (usually egrep). | |
| 1896 | |
|
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1897 Optional second argument contains the dictionary to use; the default is |
| 7606 | 1898 `ispell-alternate-dictionary'." |
| 6138 | 1899 ;; We don't use the filter for this function, rather the result is written |
| 1900 ;; into a buffer. Hence there is no need to save the filter values. | |
| 1901 (if (null lookup-dict) | |
| 1902 (setq lookup-dict ispell-alternate-dictionary)) | |
| 1903 | |
| 1904 (let* ((process-connection-type ispell-use-ptys-p) | |
| 1905 (wild-p (string-match "\\*" word)) | |
| 1906 (look-p (and ispell-look-p ; Only use look for an exact match. | |
| 1907 (or ispell-have-new-look (not wild-p)))) | |
| 1908 (ispell-grep-buffer (get-buffer-create "*Ispell-Temp*")) ; result buf | |
| 1909 (prog (if look-p ispell-look-command ispell-grep-command)) | |
| 1910 (args (if look-p ispell-look-options ispell-grep-options)) | |
| 1911 status results loc) | |
| 1912 (unwind-protect | |
| 1913 (save-window-excursion | |
| 1914 (message "Starting \"%s\" process..." (file-name-nondirectory prog)) | |
| 1915 (set-buffer ispell-grep-buffer) | |
| 1916 (if look-p | |
| 1917 nil | |
| 1918 ;; convert * to .* | |
| 1919 (insert "^" word "$") | |
| 1920 (while (search-backward "*" nil t) (insert ".")) | |
| 1921 (setq word (buffer-string)) | |
| 1922 (erase-buffer)) | |
| 1923 (setq status (call-process prog nil t nil args word lookup-dict)) | |
| 1924 ;; grep returns status 1 and no output when word not found, which | |
| 1925 ;; is a perfectly normal thing. | |
| 1926 (if (stringp status) | |
| 1927 (setq results (cons (format "error: %s exited with signal %s" | |
| 1928 (file-name-nondirectory prog) status) | |
| 1929 results)) | |
| 1930 ;; else collect words into `results' in FIFO order | |
| 1931 (goto-char (point-max)) | |
| 1932 ;; assure we've ended with \n | |
| 1933 (or (bobp) (= (preceding-char) ?\n) (insert ?\n)) | |
| 1934 (while (not (bobp)) | |
| 1935 (setq loc (point)) | |
| 1936 (forward-line -1) | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1937 (setq results (cons (buffer-substring-no-properties (point) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1938 (1- loc)) |
| 6138 | 1939 results))))) |
| 1940 ;; protected | |
| 1941 (kill-buffer ispell-grep-buffer) | |
| 1942 (if (and results (string-match ".+: " (car results))) | |
| 1943 (error "%s error: %s" ispell-grep-command (car results)))) | |
| 1944 results)) | |
| 1945 | |
| 1946 | |
| 1947 ;;; "ispell-filter" is a list of output lines from the generating function. | |
| 1948 ;;; Each full line (ending with \n) is a separate item on the list. | |
| 1949 ;;; "output" can contain multiple lines, part of a line, or both. | |
| 1950 ;;; "start" and "end" are used to keep bounds on lines when "output" contains | |
| 1951 ;;; multiple lines. | |
| 1952 ;;; "ispell-filter-continue" is true when we have received only part of a | |
| 1953 ;;; line as output from a generating function ("output" did not end with \n) | |
| 14040 | 1954 ;;; THIS FUNCTION WILL FAIL IF THE PROCESS OUTPUT DOESN'T END WITH \n! |
| 6138 | 1955 ;;; This is the case when a process dies or fails. The default behavior |
| 1956 ;;; in this case treats the next input received as fresh input. | |
| 1957 | |
| 1958 (defun ispell-filter (process output) | |
| 1959 "Output filter function for ispell, grep, and look." | |
| 1960 (let ((start 0) | |
| 1961 (continue t) | |
| 1962 end) | |
| 1963 (while continue | |
| 1964 (setq end (string-match "\n" output start)) ; get text up to the newline. | |
| 1965 ;; If we get out of sync and ispell-filter-continue is asserted when we | |
| 1966 ;; are not continuing, treat the next item as a separate list. When | |
| 1967 ;; ispell-filter-continue is asserted, ispell-filter *should* always be a | |
| 1968 ;; list! | |
| 1969 | |
| 1970 ;; Continue with same line (item)? | |
| 1971 (if (and ispell-filter-continue ispell-filter (listp ispell-filter)) | |
| 1972 ;; Yes. Add it to the prev item | |
| 1973 (setcar ispell-filter | |
| 1974 (concat (car ispell-filter) (substring output start end))) | |
| 1975 ;; No. This is a new line and item. | |
| 1976 (setq ispell-filter | |
| 1977 (cons (substring output start end) ispell-filter))) | |
| 1978 (if (null end) | |
| 1979 ;; We've completed reading the output, but didn't finish the line. | |
| 1980 (setq ispell-filter-continue t continue nil) | |
| 1981 ;; skip over newline, this line complete. | |
| 1982 (setq ispell-filter-continue nil end (1+ end)) | |
| 1983 (if (= end (length output)) ; No more lines in output | |
| 1984 (setq continue nil) ; so we can exit the filter. | |
| 1985 (setq start end)))))) ; else move start to next line of input | |
| 1986 | |
| 1987 | |
| 1988 ;;; This function destroys the mark location if it is in the word being | |
| 1989 ;;; highlighted. | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1990 (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
|
1991 refresh) |
|
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
1992 "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
|
1993 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
|
1994 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
|
1995 Uses block cursor to highlight one character. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1996 Optional REFRESH will unhighlighted then highlight, using block cursor |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1997 highlighting when REFRESH is equal to `block'." |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1998 (and (eq 'block ispell-highlight-p) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
1999 (or (eq 'block refresh) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2000 (setq start (1+ start)))) ; On block non-refresh, inc start. |
| 6138 | 2001 (let ((modified (buffer-modified-p)) ; don't allow this fn to modify buffer |
| 2002 (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
|
2003 (text (buffer-substring-no-properties start end)) ; Save hilight region |
| 6138 | 2004 (inhibit-quit t) ; inhibit interrupt processing here. |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2005 (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
|
2006 (goto-char end) |
| 6138 | 2007 (delete-region start end) |
| 14040 | 2008 (insert-char ? (- end start)) ; minimize amount of redisplay |
| 6138 | 2009 (sit-for 0) ; update display |
| 2010 (if highlight (setq inverse-video (not inverse-video))) ; toggle video | |
| 2011 (delete-region start end) ; delete whitespace | |
| 2012 (insert text) ; insert text in inverse video. | |
| 2013 (sit-for 0) ; update display showing inverse video. | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2014 (if (not highlight) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2015 (goto-char end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2016 (setq inverse-video (not inverse-video)) ; toggle video |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2017 (and (eq 'block ispell-highlight-p) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2018 (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
|
2019 (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
|
2020 (and refresh ; re-highlight |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2021 (ispell-highlight-spelling-error-generic |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2022 (if (eq 'block refresh) start (- start 2)) end t)))) |
| 6138 | 2023 |
| 2024 | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2025 (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
|
2026 "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
|
2027 When the optional third arg HIGHLIGHT is set, the word is highlighted, |
| 6138 | 2028 otherwise it is displayed normally." |
| 2029 (if highlight | |
| 2030 (isearch-highlight start end) | |
| 2031 (isearch-dehighlight t)) | |
| 2032 ;;(sit-for 0) | |
| 2033 ) | |
| 2034 | |
| 2035 | |
| 7606 | 2036 (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
|
2037 "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
|
2038 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
|
2039 otherwise it is displayed normally. |
| 7606 | 2040 |
| 7607 | 2041 The variable `ispell-highlight-face' selects the face to use for highlighting." |
| 6138 | 2042 (if highlight |
| 2043 (progn | |
| 2044 (setq ispell-overlay (make-overlay start end)) | |
| 2045 (overlay-put ispell-overlay 'face ispell-highlight-face)) | |
| 2046 (delete-overlay ispell-overlay))) | |
| 2047 | |
| 2048 | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2049 (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
|
2050 (cond |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2051 (xemacsp |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2052 (ispell-highlight-spelling-error-xemacs start end highlight)) |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2053 ((and (not version18p) |
|
30546
26e5d26a83ed
(ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents:
29208
diff
changeset
|
2054 (featurep 'faces) |
|
26e5d26a83ed
(ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents:
29208
diff
changeset
|
2055 (or (and (fboundp 'display-color-p) (display-color-p)) |
|
26e5d26a83ed
(ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents:
29208
diff
changeset
|
2056 window-system)) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2057 (ispell-highlight-spelling-error-overlay start end highlight)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2058 (t (ispell-highlight-spelling-error-generic start end highlight refresh)))) |
| 6138 | 2059 |
|
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2060 (defun ispell-adjusted-window-height (&optional window) |
|
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2061 "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
|
2062 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
|
2063 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
|
2064 `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
|
2065 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
|
2066 `window-height'." |
|
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2067 (cond ((fboundp 'window-text-height) |
|
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2068 (1+ (window-text-height window))) |
|
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2069 (ispell-graphic-p |
|
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2070 (1- (window-height window))) |
|
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2071 (t |
|
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2072 (window-height window)))) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2073 |
| 6138 | 2074 (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
|
2075 "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
|
2076 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
|
2077 scrolling the current window. Leave the new window selected." |
| 6138 | 2078 (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
|
2079 (let ((oldot (save-excursion (vertical-motion -1) (point))) |
| 6138 | 2080 (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
|
2081 ;; If line above old point (line starting at oldot) would be |
| 6138 | 2082 ;; hidden by new window, scroll it to just below new win |
| 2083 ;; otherwise set top line of other win so it doesn't scroll. | |
| 2084 (if (< oldot top) (setq top oldot)) | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2085 ;; if frame is unsplitable, temporarily disable that... |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2086 (if (cdr (assq 'unsplittable (frame-parameters (selected-frame)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2087 (let ((frame (selected-frame))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2088 (modify-frame-parameters frame '((unsplittable . nil))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2089 (split-window nil height) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2090 (modify-frame-parameters frame '((unsplittable . t)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2091 (split-window nil height)) |
|
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2092 (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
|
2093 (when (> deficit 0) |
|
35221
20bc16b92eef
(ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents:
34632
diff
changeset
|
2094 ;; 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
|
2095 ;; 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
|
2096 (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
|
2097 (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
|
2098 (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
|
2099 (setq top (min (point) oldot)))) |
| 6138 | 2100 (set-window-start (next-window) top)))) |
| 2101 | |
| 2102 | |
| 2103 ;;; Should we add a compound word match return value? | |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2104 (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
|
2105 "Parse the OUTPUT string from Ispell process and return: |
| 7607 | 2106 1: t for an exact match. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2107 2: A string containing the root word matched via suffix removal. |
| 6138 | 2108 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
|
2109 (\"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
|
2110 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
|
2111 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
|
2112 MISS-LIST and GUESS-LIST are possibly null lists of guesses and misses. |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2113 4: Nil when an error has occurred. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2114 |
|
37007
4caced3e865e
(ispell-parse-output): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
36815
diff
changeset
|
2115 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
|
2116 Optional third arg SHIFT is an offset to apply based on previous corrections." |
| 6138 | 2117 (cond |
| 2118 ((string= output "") t) ; for startup with pipes... | |
| 2119 ((string= output "*") t) ; exact match | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2120 ((string= output "-") t) ; compound word match |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2121 ((string= (substring output 0 1) "+") ; found because of root word |
| 6138 | 2122 (substring output 2)) ; return root word |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2123 ((equal 0 (string-match "[\ra-zA-Z]" output)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2124 (ding) ; error message from ispell! |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2125 (message (concat "Ispell error: " output)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2126 (sit-for 5) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2127 nil) |
| 6138 | 2128 (t ; need to process &, ?, and #'s |
| 2129 (let ((type (substring output 0 1)) ; &, ?, or # | |
| 2130 (original-word (substring output 2 (string-match " " output 2))) | |
| 2131 (cur-count 0) ; contains number of misses + guesses | |
| 2132 count miss-list guess-list offset) | |
| 2133 (setq output (substring output (match-end 0))) ; skip over misspelling | |
| 2134 (if (string= type "#") | |
| 2135 (setq count 0) ; no misses for type # | |
| 2136 (setq count (string-to-int output) ; get number of misses. | |
| 2137 output (substring output (1+ (string-match " " output 1))))) | |
| 2138 (setq offset (string-to-int output)) | |
| 2139 (if (string= type "#") ; No miss or guess list. | |
| 2140 (setq output nil) | |
| 2141 (setq output (substring output (1+ (string-match " " output 1))))) | |
| 2142 (while output | |
| 2143 (let ((end (string-match ", \\|\\($\\)" output))) ; end of miss/guess. | |
| 2144 (setq cur-count (1+ cur-count)) | |
| 2145 (if (> cur-count count) | |
| 2146 (setq guess-list (cons (substring output 0 end) guess-list)) | |
| 2147 (setq miss-list (cons (substring output 0 end) miss-list))) | |
| 2148 (if (match-end 1) ; True only when at end of line. | |
| 2149 (setq output nil) ; no more misses or guesses | |
| 2150 (setq output (substring output (+ end 2)))))) | |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2151 ;; return results. Accept word if it was already accepted. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2152 ;; adjust offset. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2153 (if (member original-word accept-list) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2154 t |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2155 (list original-word |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2156 (if (numberp shift) (+ shift offset) offset) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2157 (nreverse miss-list) (nreverse guess-list))))))) |
| 6138 | 2158 |
| 2159 | |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2160 (defun ispell-process-status () |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2161 "Return the status of the Ispell process. |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2162 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
|
2163 (if ispell-async-processp |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2164 (process-status ispell-process) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2165 (and ispell-process 'run))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2166 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2167 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2168 (defun ispell-start-process () |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2169 "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
|
2170 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
|
2171 (let (args) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2172 ;; Local dictionary becomes the global dictionary in use. |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2173 (if ispell-local-dictionary |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2174 (setq ispell-dictionary ispell-local-dictionary)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2175 (setq args (ispell-get-ispell-args)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2176 (if ispell-dictionary ; use specified dictionary |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2177 (setq args |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2178 (append (list "-d" ispell-dictionary) args))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2179 (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
|
2180 (setq args |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2181 (append args |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2182 (list "-p" |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2183 (expand-file-name ispell-personal-dictionary))))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2184 (setq args (append args ispell-extra-args)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2185 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2186 (if ispell-async-processp |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2187 (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
|
2188 (apply 'start-process |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2189 "ispell" nil ispell-program-name |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2190 "-a" ; accept single input lines |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2191 "-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
|
2192 args)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2193 (setq ispell-cmd-args args |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2194 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
|
2195 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
|
2196 (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
|
2197 t))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2198 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2199 |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2200 |
| 6138 | 2201 (defun ispell-init-process () |
|
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2202 "Check status of Ispell process and start if necessary." |
| 6138 | 2203 (if (and ispell-process |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2204 (eq (ispell-process-status) 'run) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2205 ;; If we're using a personal dictionary, ensure |
| 6138 | 2206 ;; we're in the same default directory! |
| 2207 (or (not ispell-personal-dictionary) | |
| 2208 (equal ispell-process-directory default-directory))) | |
| 2209 (setq ispell-filter nil ispell-filter-continue nil) | |
| 2210 ;; may need to restart to select new personal dictionary. | |
| 2211 (ispell-kill-ispell t) | |
|
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2212 (message "Starting new Ispell process...") |
| 6138 | 2213 (sit-for 0) |
| 2214 (check-ispell-version) | |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2215 (setq ispell-process-directory default-directory |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2216 ispell-process (ispell-start-process) |
| 6138 | 2217 ispell-filter nil |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2218 ispell-filter-continue nil) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2219 (if ispell-async-processp |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2220 (set-process-filter ispell-process 'ispell-filter)) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2221 ;; protect against bogus binding of `enable-multibyte-characters' in XEmacs |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2222 (if (and (or xemacsp |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2223 (and (boundp 'enable-multibyte-characters) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2224 enable-multibyte-characters)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2225 (fboundp 'set-process-coding-system)) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2226 (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
|
2227 (ispell-get-coding-system))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2228 ;; Get version ID line |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2229 (if (not version18p) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2230 (ispell-accept-output 3) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2231 (ispell-accept-output)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2232 ;; get more output if filter empty? |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2233 (if (null ispell-filter) (ispell-accept-output 3)) |
| 6138 | 2234 (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
|
2235 (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
|
2236 ((and |
|
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
2237 (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
|
2238 (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
|
2239 (progn |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2240 (if (not version18p) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2241 (ispell-accept-output 3) ; was warn msg. |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2242 (ispell-accept-output)) |
|
11469
11c4f543b742
(ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents:
11304
diff
changeset
|
2243 (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
|
2244 (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
|
2245 (string-match "^@(#) " (car ispell-filter))) |
| 6138 | 2246 ;; got the version line as expected (we already know it's the right |
| 2247 ;; version, so don't bother checking again.) | |
| 2248 nil) | |
| 2249 (t | |
| 2250 ;; Otherwise, it must be an error message. Show the user. | |
| 2251 ;; But first wait to see if some more output is going to arrive. | |
| 2252 ;; Otherwise we get cool errors like "Can't open ". | |
| 2253 (sleep-for 1) | |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2254 (ispell-accept-output 3) |
| 6138 | 2255 (error "%s" (mapconcat 'identity ispell-filter "\n")))) |
| 2256 (setq ispell-filter nil) ; Discard version ID line | |
| 2257 (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
|
2258 (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
|
2259 (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
|
2260 (if ispell-async-processp |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2261 (process-kill-without-query ispell-process)))) |
| 6138 | 2262 |
|
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
2263 ;;;###autoload |
| 6138 | 2264 (defun ispell-kill-ispell (&optional no-error) |
| 7607 | 2265 "Kill current Ispell process (so that you may start a fresh one). |
| 2266 With NO-ERROR, just return non-nil if there was no Ispell running." | |
| 6138 | 2267 (interactive) |
| 2268 (if (not (and ispell-process | |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2269 (eq (ispell-process-status) 'run))) |
| 6138 | 2270 (or no-error |
| 2271 (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
|
2272 (if ispell-async-processp |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2273 (progn |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2274 (process-send-eof ispell-process) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2275 (if (eq (ispell-process-status) 'run) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2276 (ispell-accept-output 1)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2277 (if (eq (ispell-process-status) 'run) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2278 (kill-process ispell-process)) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2279 (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
|
2280 (eq (ispell-process-status) 'signal))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2281 (if (or xemacsp version20p) (sleep-for 0.25) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2282 (sleep-for 0 250)))) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2283 ;; synchronous processes |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2284 (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
|
2285 (kill-buffer ispell-output-buffer) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2286 (kill-buffer ispell-session-buffer) |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2287 (setq ispell-output-buffer nil |
|
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2288 ispell-session-buffer nil)) |
| 6138 | 2289 (setq ispell-process nil) |
|
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2290 (message "Ispell process killed") |
| 6138 | 2291 nil)) |
| 2292 | |
| 2293 | |
|
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2294 ;;; 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
|
2295 ;;; 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
|
2296 |
| 6138 | 2297 ;;;###autoload |
| 2298 (defun ispell-change-dictionary (dict &optional arg) | |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2299 "Change `ispell-dictionary' (q.v.) to DICT and kill old Ispell process. |
| 6138 | 2300 A new one will be started as soon as necessary. |
| 2301 | |
| 2302 By just answering RET you can find out what the current dictionary is. | |
| 2303 | |
|
37545
931c07edd6e3
(ispell-change-dictionary): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
37426
diff
changeset
|
2304 With prefix argument, set the default dictionary." |
| 6138 | 2305 (interactive |
| 2306 (list (completing-read | |
| 2307 "Use new dictionary (RET for current, SPC to complete): " | |
| 2308 (cons (cons "default" nil) ispell-dictionary-alist) nil t) | |
| 2309 current-prefix-arg)) | |
| 2310 (if (equal dict "default") (setq dict nil)) | |
| 2311 ;; This relies on completing-read's bug of returning "" for no match | |
| 2312 (cond ((equal dict "") | |
| 2313 (message "Using %s dictionary" | |
| 2314 (or ispell-local-dictionary ispell-dictionary "default"))) | |
| 2315 ((and (equal dict ispell-dictionary) | |
|
10697
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2316 (or (null ispell-local-dictionary) |
|
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2317 (equal dict ispell-local-dictionary))) |
| 6138 | 2318 ;; 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
|
2319 (and (interactive-p) |
|
d2fd1a6288b4
Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents:
10462
diff
changeset
|
2320 (message "No change, using %s dictionary" (or dict "default")))) |
| 6138 | 2321 (t ; reset dictionary! |
| 2322 (if (assoc dict ispell-dictionary-alist) | |
| 2323 (progn | |
| 2324 (if (or arg (null dict)) ; set default dictionary | |
| 2325 (setq ispell-dictionary dict)) | |
| 2326 (if (null arg) ; set local dictionary | |
| 2327 (setq ispell-local-dictionary dict))) | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2328 (error "Undefined dictionary: %s" dict)) |
| 6138 | 2329 (ispell-kill-ispell t) |
|
7592
c12c2c0c7d5f
Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents:
7585
diff
changeset
|
2330 (message "(Next %sIspell command will use %s dictionary)" |
| 6138 | 2331 (cond ((equal ispell-local-dictionary ispell-dictionary) |
| 2332 "") | |
| 2333 (arg "global ") | |
| 2334 (t "local ")) | |
| 2335 (or (if (or (equal ispell-local-dictionary ispell-dictionary) | |
| 2336 (null arg)) | |
| 2337 ispell-local-dictionary | |
| 2338 ispell-dictionary) | |
| 2339 "default"))))) | |
| 2340 | |
| 2341 | |
| 2342 ;;; Spelling of comments are checked when ispell-check-comments is non-nil. | |
| 2343 | |
| 2344 ;;;###autoload | |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2345 (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
|
2346 "Interactively check a region for spelling errors. |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2347 Return nil if spell session is quit, |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2348 otherwise returns shift offset amount for last line processed." |
| 6138 | 2349 (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
|
2350 (if (not recheckp) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2351 (ispell-accept-buffer-local-defs)) ; set up dictionary, local words, etc. |
| 6138 | 2352 (unwind-protect |
| 7606 | 2353 (save-excursion |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2354 (message "Spell checking %s using %s dictionary..." |
| 7606 | 2355 (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
|
2356 (buffer-name) "region") |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2357 (or ispell-dictionary "default")) |
|
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2358 ;; Returns cursor to original location. |
| 7606 | 2359 (save-window-excursion |
| 2360 (goto-char reg-start) | |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2361 (let ((transient-mark-mode) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2362 (case-fold-search case-fold-search) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2363 (skip-region-start (make-marker)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2364 (skip-regexp (ispell-begin-skip-region-regexp)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2365 (skip-alist ispell-skip-region-alist) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2366 key) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2367 (if (eq ispell-parser 'tex) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2368 (setq case-fold-search nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2369 skip-alist |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2370 (append (car ispell-tex-skip-alists) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2371 (car (cdr ispell-tex-skip-alists)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2372 skip-alist))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2373 (let (message-log-max) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2374 (message "searching for regions to skip")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2375 (if (re-search-forward skip-regexp reg-end t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2376 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2377 (setq key (buffer-substring-no-properties |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2378 (match-beginning 0) (match-end 0))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2379 (set-marker skip-region-start (- (point) (length key))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2380 (goto-char reg-start))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2381 (let (message-log-max) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2382 (message "Continuing spelling check using %s dictionary..." |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2383 (or ispell-dictionary "default"))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2384 (set-marker ispell-region-end reg-end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2385 (while (and (not ispell-quit) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2386 (< (point) ispell-region-end)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2387 ;; spell-check region with skipping |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2388 (if (and (marker-position skip-region-start) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2389 (<= skip-region-start (point))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2390 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2391 (ispell-skip-region key skip-alist) ; moves pt past region. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2392 (setq reg-start (point)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2393 (if (and (< reg-start ispell-region-end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2394 (re-search-forward skip-regexp |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2395 ispell-region-end t)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2396 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2397 (setq key (buffer-substring-no-properties |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2398 (car (match-data)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2399 (car (cdr (match-data))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2400 (set-marker skip-region-start |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2401 (- (point) (length key))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2402 (goto-char reg-start)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2403 (set-marker skip-region-start nil)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2404 (setq reg-end (if (marker-position skip-region-start) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2405 (min skip-region-start ispell-region-end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2406 (marker-position ispell-region-end))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2407 (let* ((start (point)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2408 (end (save-excursion (end-of-line) (min (point) reg-end))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2409 (string (ispell-get-line start end reg-end))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2410 (setq end (point)) ; "end" tracks region retrieved. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2411 (if string ; there is something to spell check! |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2412 ;; (special start end) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2413 (setq shift (ispell-process-line string |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2414 (and recheckp shift)))) |
| 7606 | 2415 (goto-char end))))) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2416 (if ispell-quit |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2417 nil |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2418 (or shift 0))) |
| 7606 | 2419 ;; protected |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2420 (if (and (not (and recheckp ispell-keep-choices-win)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2421 (get-buffer ispell-choices-buffer)) |
| 7606 | 2422 (kill-buffer ispell-choices-buffer)) |
| 2423 (if ispell-quit | |
| 2424 (progn | |
| 2425 ;; preserve or clear the region for ispell-continue. | |
| 2426 (if (not (numberp ispell-quit)) | |
| 2427 (set-marker ispell-region-end nil) | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2428 ;; Ispell-continue enabled - ispell-region-end is set. |
| 7606 | 2429 (goto-char ispell-quit)) |
| 2430 ;; Check for aborting | |
| 2431 (if (and ispell-checking-message (numberp ispell-quit)) | |
| 2432 (progn | |
| 2433 (setq ispell-quit nil) | |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2434 (error "Message send aborted"))) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2435 (if (not recheckp) (setq ispell-quit nil))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2436 (if (not recheckp) (set-marker ispell-region-end nil)) |
| 7606 | 2437 ;; Only save if successful exit. |
| 2438 (ispell-pdict-save ispell-silently-savep) | |
| 2439 (message "Spell-checking done")))) | |
| 6138 | 2440 |
| 2441 | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2442 ;;; Creates the regexp for skipping a region. |
| 22529 | 2443 ;;; Makes the skip-regexp local for tex buffers adding in the |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2444 ;;; tex expressions to skip as well. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2445 ;;; Call AFTER ispell-buffer-local-parsing. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2446 (defun ispell-begin-skip-region-regexp () |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2447 (let ((skip-regexp (ispell-begin-skip-region))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2448 (if (and (null ispell-check-comments) comment-start) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2449 (setq skip-regexp (concat (regexp-quote comment-start) "\\|" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2450 skip-regexp))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2451 (if (and (eq 'exclusive ispell-check-comments) comment-start) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2452 (setq skip-regexp (concat (if (string= "" comment-end) "^" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2453 (regexp-quote comment-end)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2454 "\\|" skip-regexp))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2455 (if ispell-skip-tib |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2456 (setq skip-regexp (concat ispell-tib-ref-beginning "\\|" skip-regexp))) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2457 (if ispell-skip-html |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2458 (setq skip-regexp (concat "<[cC][oO][dD][eE]\\>[^>]*>" "\\|" |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2459 "<[sS][cC][rR][iI][pP][tT]\\>[^>]*>" "\\|" |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2460 "<[aA][pP][pP][lL][eE][tT]\\>[^>]*>" "\\|" |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2461 "<[vV][eE][rR][bB]\\>[^>]*>" "\\|" |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2462 ;; "<[tT][tT]\\>[^>]*>" "\\|" |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2463 "<[tT][tT]/" "\\|" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2464 "<" "\\|" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2465 "&" "\\|" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2466 skip-regexp))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2467 (if (eq ispell-parser 'tex) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2468 (setq skip-regexp (concat (ispell-begin-tex-skip-regexp) "\\|" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2469 skip-regexp))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2470 skip-regexp)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2471 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2472 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2473 (defun ispell-begin-tex-skip-regexp () |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2474 "Regular expression of tex commands to skip. |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2475 Generated from `ispell-tex-skip-alists'." |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2476 (concat |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2477 (mapconcat (function (lambda (lst) (car lst))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2478 (car ispell-tex-skip-alists) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2479 "\\|") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2480 "\\|" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2481 (mapconcat (function (lambda (lst) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2482 (concat "\\\\begin[ \t\n]*{[ \t\n]*" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2483 (car lst) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2484 "[ \t\n]*}"))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2485 (car (cdr ispell-tex-skip-alists)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2486 "\\|"))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2487 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2488 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2489 (defun ispell-begin-skip-region () |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2490 "Regular expression of regions to skip for all buffers. |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2491 Each selection should be a key of `ispell-skip-region-alist'; |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2492 otherwise, the current line is skipped." |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2493 (mapconcat (function (lambda (lst) (if (stringp (car lst)) (car lst) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2494 (eval (car lst))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2495 ispell-skip-region-alist |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2496 "\\|")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2497 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2498 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2499 (defun ispell-tex-arg-end (&optional arg) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2500 (condition-case nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2501 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2502 (while (looking-at "[ \t\n]*\\[") (forward-sexp)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2503 (forward-sexp (or arg 1))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2504 (error |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2505 (message "error skipping s-expressions at point %d." (point)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2506 (beep) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2507 (sit-for 2)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2508 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2509 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2510 ;;; Skips to region-end from point, or a single line. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2511 ;;; Places point at end of region skipped. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2512 (defun ispell-skip-region (key alist) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2513 ;; move over key to begin checking. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2514 (forward-char (length key)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2515 (let ((start (point)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2516 alist-key null-skip) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2517 (cond |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2518 ;; what about quoted comment, or comment inside strings? |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2519 ((and (null ispell-check-comments) comment-start |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2520 (string= key comment-start)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2521 (if (string= "" comment-end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2522 (forward-line) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2523 (search-forward comment-end ispell-region-end t))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2524 ((and (eq 'exclusive ispell-check-comments) comment-start |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2525 (string= key comment-end)) |
|
22526
56bcedfdbe83
(ispell-skip-region): Don't complain when
Karl Heuer <kwzh@gnu.org>
parents:
22461
diff
changeset
|
2526 (search-forward comment-start ispell-region-end :end)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2527 ((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
|
2528 (re-search-forward ispell-tib-ref-end ispell-region-end t)) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2529 ((and ispell-skip-html (string-match "</" key)) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2530 (search-forward ">" ispell-region-end t)) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2531 ((and ispell-skip-html (string-match "<[cC][oO][dD][eE]\\>[^>]*>" key)) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2532 (search-forward-regexp "</[cC][oO][dD][eE]>" ispell-region-end t)) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2533 ((and ispell-skip-html |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2534 (string-match "<[sS][cC][rR][iI][pP][tT]\\>[^>]*>" key)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2535 (search-forward-regexp "</[sS][cC][rR][iI][pP][tT]>" ispell-region-end t)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2536 ((and ispell-skip-html |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2537 (string-match "<[aA][pP][pP][lL][eE][tT]\\>[^>]*>" key)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2538 (search-forward-regexp "</[aA][pP][pP][lL][eE][tT]>" ispell-region-end t)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2539 ((and ispell-skip-html (string-match "<[vV][eE][rR][bB]\\>[^>]*>" key)) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2540 (search-forward-regexp "</[vV][eE][rR][bB]>" ispell-region-end t)) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2541 ;;((and ispell-skip-html (string-match "<[tT][tT]\\>[^>]*>" key)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2542 ;; (search-forward-regexp "</[tT][tT]>" ispell-region-end t)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2543 ((and ispell-skip-html (string-match "<[tT][tT]/" key)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2544 (search-forward "/" ispell-region-end t)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2545 ((and ispell-skip-html (string-match "<" key)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2546 (search-forward ">" ispell-region-end t)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2547 ((and ispell-skip-html (string-match "&" key)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2548 (search-forward-regexp "[; \t\n]" ispell-region-end t)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2549 ;; markings from alist |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2550 (t |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2551 (while alist |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2552 (setq alist-key (eval (car (car alist)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2553 (if (string-match alist-key key) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2554 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2555 (setq alist (cdr (car alist))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2556 (cond |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2557 ((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
|
2558 ((not (consp alist)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2559 ;; 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
|
2560 (re-search-forward (eval alist) (point-max) t)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2561 ((consp alist) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2562 (if (stringp alist) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2563 (re-search-forward alist (point-max) t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2564 (setq null-skip t) ; error handling in functions! |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2565 (if (consp (cdr alist)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2566 (apply (car alist) (cdr alist)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2567 (funcall (car alist)))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2568 (setq alist nil)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2569 (setq alist (cdr alist)))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2570 (if (and (= start (point)) (null null-skip)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2571 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2572 (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
|
2573 key (point)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2574 (beep) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2575 (sit-for 2))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2576 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2577 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2578 ;;; Grab the next line of data. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2579 ;;; Returns a string with the line data |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2580 (defun ispell-get-line (start end reg-end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2581 (let ((ispell-casechars (ispell-get-casechars)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2582 string) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2583 (cond ; LOOK AT THIS LINE AND SKIP OR PROCESS |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2584 ((eolp) ; END OF LINE, just go to next line. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2585 (forward-line)) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2586 ;;((looking-at "[-#@*+!%~^]") ; SKIP SPECIAL ISPELL CHARACTERS |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2587 ;; (forward-char 1)) ; not needed as quoted below. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2588 ((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
|
2589 (re-search-forward "[][()${}]" end t)) ; or MATH COMMANDS |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2590 (setq string (concat "^" (buffer-substring-no-properties start end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2591 "\n")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2592 (goto-char end)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2593 (t (goto-char end))) ; EMPTY LINE, skip it. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2594 string)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2595 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2596 |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2597 ;;; 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
|
2598 (eval-when-compile |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2599 (defvar start) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2600 (defvar end)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2601 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2602 (defun ispell-process-line (string shift) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2603 "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
|
2604 This will modify the buffer for spelling errors. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2605 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
|
2606 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
|
2607 ;;(declare special start end) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2608 (let (poss accept-list) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2609 (if (not (numberp shift)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2610 (setq shift 0)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2611 ;; 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
|
2612 (ispell-send-string string) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2613 (while (progn |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2614 (ispell-accept-output) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2615 ;; Last item of output contains a blank line. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2616 (not (string= "" (car ispell-filter))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2617 ;; 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
|
2618 ;; Place in FIFO order and remove the blank item. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2619 (setq ispell-filter (nreverse (cdr ispell-filter))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2620 (while (and (not ispell-quit) ispell-filter) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2621 ;; get next word, accounting for accepted words and start shifts |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2622 (setq poss (ispell-parse-output (car ispell-filter) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2623 accept-list shift)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2624 (if (and poss (listp poss)) ; spelling error occurred. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2625 ;; Whenever we have misspellings, we can change |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2626 ;; the buffer. Keep boundaries as markers. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2627 ;; Markers can move with highlighting! This destroys |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2628 ;; 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
|
2629 (let ((word-start |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2630 (copy-marker (+ start ispell-offset (car (cdr poss))))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2631 (word-len (length (car poss))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2632 (line-end (copy-marker end)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2633 (line-start (copy-marker start)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2634 recheck-region replace) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2635 (goto-char word-start) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2636 ;; Adjust the horizontal scroll & point |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2637 (ispell-horiz-scroll) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2638 (goto-char (+ word-len word-start)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2639 (ispell-horiz-scroll) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2640 (goto-char word-start) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2641 (ispell-horiz-scroll) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2642 |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2643 ;; Alignment cannot be tracked and this error will occur when |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2644 ;; `query-replace' makes multiple corrections on the starting line. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2645 (if (/= (+ word-len (point)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2646 (progn |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2647 ;; NB: Search can fail with Mule character sets that don't |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2648 ;; display properly. Ignore the error in this case? |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2649 (search-forward (car poss) (+ word-len (point)) t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2650 (point))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2651 ;; This occurs due to filter pipe problems |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2652 (error (concat "Ispell misalignment: word " |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2653 "`%s' point %d; probably incompatible versions") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2654 (car poss) (marker-position word-start))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2655 ;; ispell-cmd-loop can go recursive & change buffer |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2656 (if ispell-keep-choices-win |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2657 (setq replace (ispell-command-loop |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2658 (car (cdr (cdr poss))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2659 (car (cdr (cdr (cdr poss)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2660 (car poss) (marker-position word-start) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2661 (+ word-len (marker-position word-start)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2662 (save-window-excursion |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2663 (setq replace (ispell-command-loop |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2664 (car (cdr (cdr poss))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2665 (car (cdr (cdr (cdr poss)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2666 (car poss) (marker-position word-start) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2667 (+ word-len (marker-position word-start)))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2668 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2669 (goto-char word-start) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2670 ;; Recheck when query replace edit changes misspelled word. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2671 ;; 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
|
2672 (if (and replace (listp replace) (= 2 (length replace))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2673 (if (and (eq ispell-parser 'tex) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2674 (string-match "[\\\\][]()[]\\|\\\\begin\\|\\$" |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2675 (regexp-quote string))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2676 (error |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2677 "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
|
2678 ) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2679 (set-marker line-end (point)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2680 (setq ispell-filter nil |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2681 recheck-region t))) |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
2682 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2683 ;; insert correction if needed |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2684 (cond |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2685 ((or (null replace) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2686 (equal 0 replace)) ; ACCEPT/INSERT |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2687 (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2688 (ispell-add-per-file-word-list (car poss))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2689 ;; do not recheck accepted word on this line |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2690 (setq accept-list (cons (car poss) accept-list))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2691 (t ; replacement word selected or entered |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2692 (delete-region (point) (+ word-len (point))) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2693 (if (not (listp replace)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2694 (progn |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2695 (insert replace) ; insert dictionary word |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2696 (setq accept-list (cons replace accept-list))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2697 (let ((replace-word (car replace))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2698 ;; Recheck hand entered replacement word |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2699 (insert replace-word) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2700 (if (car (cdr replace)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2701 (save-window-excursion |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2702 (delete-other-windows) ; to correctly show help. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2703 ;; Assume case-replace & |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2704 ;; case-fold-search correct? |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2705 (query-replace (car poss) (car replace) t))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2706 (goto-char word-start) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2707 ;; do not recheck if already accepted |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2708 (if (member replace-word accept-list) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2709 (setq accept-list (cons replace-word accept-list) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2710 replace replace-word) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2711 (let ((region-end (copy-marker ispell-region-end))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2712 (setq recheck-region ispell-filter |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2713 ispell-filter nil ; save filter |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2714 shift 0 ; already accounted |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2715 shift (ispell-region |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2716 word-start |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2717 (+ word-start (length replace-word)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2718 t shift)) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2719 (if (null shift) ; quitting check. |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2720 (setq shift 0)) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2721 (set-marker ispell-region-end region-end) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2722 (set-marker region-end nil) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2723 (setq ispell-filter recheck-region |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2724 recheck-region nil |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2725 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
|
2726 |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2727 (setq shift (+ shift (- (length replace) word-len))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2728 |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2729 ;; Move line-start across word... |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2730 ;; new shift function does this now... |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2731 ;;(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
|
2732 ;; (- (length replace) |
|
313ef0d76864
(ispell-menu-map-needed): Check that ispell-process
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28563
diff
changeset
|
2733 ;; (length (car poss))))) |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2734 )) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2735 (if (not ispell-quit) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2736 (let (message-log-max) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2737 (message "Continuing spelling check using %s dictionary..." |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2738 (or ispell-dictionary "default")))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2739 (sit-for 0) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2740 (setq start (marker-position line-start) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2741 end (marker-position line-end)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2742 ;; Adjust markers when end of region lost from highlighting. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2743 (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
|
2744 (setq end (+ word-start word-len))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2745 (if (= word-start ispell-region-end) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2746 (set-marker ispell-region-end (+ word-start word-len))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2747 ;; going out of scope - unneeded |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2748 (set-marker line-start nil) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2749 (set-marker word-start nil) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2750 (set-marker line-end nil))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2751 ;; finished with misspelling! |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2752 (setq ispell-filter (cdr ispell-filter))) |
|
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
2753 shift)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2754 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2755 |
|
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2756 ;;;###autoload |
|
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2757 (defun ispell-comments-and-strings () |
|
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2758 "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
|
2759 (interactive) |
|
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2760 (goto-char (point-min)) |
|
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2761 (let (state done) |
|
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2762 (while (not done) |
|
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2763 (setq done t) |
|
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2764 (setq state (parse-partial-sexp (point) (point-max) |
|
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2765 nil nil state 'syntax-table)) |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2766 (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
|
2767 (let ((start (point))) |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2768 (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
|
2769 nil nil state 'syntax-table)) |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2770 (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
|
2771 (error "Unterminated string or comment")) |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2772 (save-excursion |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2773 (setq done (not (ispell-region start (point)))))))))) |
|
20389
e15a9b5e0a70
New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents:
20089
diff
changeset
|
2774 |
| 6138 | 2775 |
| 2776 ;;;###autoload | |
| 7606 | 2777 (defun ispell-buffer () |
| 6138 | 2778 "Check the current buffer for spelling errors interactively." |
| 2779 (interactive) | |
| 2780 (ispell-region (point-min) (point-max))) | |
| 2781 | |
| 7606 | 2782 |
|
6288
3197bf3cc0a1
(ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents:
6285
diff
changeset
|
2783 ;;;###autoload |
| 6138 | 2784 (defun ispell-continue () |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2785 "Continue a halted spelling session beginning with the current word." |
| 6138 | 2786 (interactive) |
| 2787 (if (not (marker-position ispell-region-end)) | |
| 2788 (message "No session to continue. Use 'X' command when checking!") | |
| 2789 (if (not (equal (marker-buffer ispell-region-end) (current-buffer))) | |
| 2790 (message "Must continue ispell from buffer %s" | |
| 2791 (buffer-name (marker-buffer ispell-region-end))) | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2792 (ispell-region |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2793 ;; find beginning of current word: |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2794 (car (cdr (ispell-get-word t))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2795 (marker-position ispell-region-end))))) |
| 6138 | 2796 |
| 2797 | |
| 2798 ;;; Horizontal scrolling | |
| 7606 | 2799 (defun ispell-horiz-scroll () |
| 2800 "Places point within the horizontal visibility of its window area." | |
| 6138 | 2801 (if truncate-lines ; display truncating lines? |
| 2802 ;; See if display needs to be scrolled. | |
| 2803 (let ((column (- (current-column) (max (window-hscroll) 1)))) | |
| 2804 (if (and (< column 0) (> (window-hscroll) 0)) | |
| 2805 (scroll-right (max (- column) 10)) | |
| 2806 (if (>= column (- (window-width) 2)) | |
| 2807 (scroll-left (max (- column (window-width) -3) 10))))))) | |
| 2808 | |
| 2809 | |
| 2810 ;;; Interactive word completion. | |
| 2811 ;;; Forces "previous-word" processing. Do we want to make this selectable? | |
| 2812 | |
| 2813 ;;;###autoload | |
| 2814 (defun ispell-complete-word (&optional interior-frag) | |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2815 "Try to complete the word before or under point (see `lookup-words') |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2816 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
|
2817 sequence inside of a word. |
| 6138 | 2818 |
| 2819 Standard ispell choices are then available." | |
| 2820 (interactive "P") | |
| 2821 (let ((cursor-location (point)) | |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2822 (case-fold-search-val case-fold-search) |
| 6138 | 2823 (word (ispell-get-word nil "\\*")) ; force "previous-word" processing. |
| 2824 start end possibilities replacement) | |
| 2825 (setq start (car (cdr word)) | |
| 2826 end (car (cdr (cdr word))) | |
| 2827 word (car word) | |
| 2828 possibilities | |
| 2829 (or (string= word "") ; Will give you every word | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2830 (lookup-words (concat (and interior-frag "*") word |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2831 (if (or interior-frag (null ispell-look-p)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2832 "*")) |
| 6138 | 2833 ispell-complete-word-dict))) |
| 2834 (cond ((eq possibilities t) | |
| 2835 (message "No word to complete")) | |
| 2836 ((null possibilities) | |
| 2837 (message "No match for \"%s\"" word)) | |
| 2838 (t ; There is a modification... | |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2839 (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
|
2840 (cond |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2841 ((string-equal (upcase word) word) |
| 7606 | 2842 (setq possibilities (mapcar 'upcase possibilities))) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2843 ((string-equal (upcase (substring word 0 1)) (substring word 0 1)) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2844 (setq possibilities (mapcar (function |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2845 (lambda (pos) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2846 (if (string-equal |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2847 (substring word 0 1) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2848 (substring pos 0 1)) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2849 pos |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2850 (capitalize pos)))) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2851 possibilities)))) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2852 (setq case-fold-search case-fold-search-val) |
|
9416
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2853 (save-window-excursion |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2854 (setq replacement |
|
e916757c9acc
(ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents:
9201
diff
changeset
|
2855 (ispell-command-loop possibilities nil word start end))) |
| 6138 | 2856 (cond |
| 2857 ((equal 0 replacement) ; BUFFER-LOCAL ADDITION | |
| 2858 (ispell-add-per-file-word-list word)) | |
| 2859 (replacement ; REPLACEMENT WORD | |
| 2860 (delete-region start end) | |
| 2861 (setq word (if (atom replacement) replacement (car replacement)) | |
| 2862 cursor-location (+ (- (length word) (- end start)) | |
| 2863 cursor-location)) | |
| 2864 (insert word) | |
| 2865 (if (not (atom replacement)) ; recheck spelling of replacement. | |
| 2866 (progn | |
| 2867 (goto-char cursor-location) | |
| 2868 (ispell-word nil t))))) | |
| 2869 (if (get-buffer ispell-choices-buffer) | |
| 2870 (kill-buffer ispell-choices-buffer)))) | |
| 2871 (ispell-pdict-save ispell-silently-savep) | |
| 2872 (goto-char cursor-location))) | |
| 2873 | |
| 2874 | |
| 2875 ;;;###autoload | |
| 2876 (defun ispell-complete-word-interior-frag () | |
| 7606 | 2877 "Completes word matching character sequence inside a word." |
| 6138 | 2878 (interactive) |
| 2879 (ispell-complete-word t)) | |
| 2880 | |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2881 |
|
30563
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2882 ;;;###autoload |
|
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2883 (defun ispell () |
|
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2884 "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
|
2885 If `transient-mark-mode' is on, and a region is active, spell-check |
| 34364 | 2886 that region. Otherwise spell-check the buffer. |
| 2887 | |
| 2888 Ispell dictionaries are not distributed with Emacs. If you are | |
| 2889 looking for a dictionary, please see the distribution of the GNU ispell | |
| 2890 program, or do an Internet search; there are various dictionaries | |
| 2891 available on the net." | |
|
30563
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2892 (interactive) |
|
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2893 (if (and transient-mark-mode mark-active) |
|
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2894 (ispell-region (region-beginning) (region-end)) |
|
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2895 (ispell-buffer))) |
|
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2896 |
|
a8130a547f56
(ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents:
30546
diff
changeset
|
2897 |
|
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2898 ;;; ********************************************************************** |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2899 ;;; Ispell Minor Mode |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2900 ;;; ********************************************************************** |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2901 |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2902 (defvar ispell-minor-mode nil |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2903 "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
|
2904 ;; 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
|
2905 (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
|
2906 |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2907 (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
|
2908 (setq minor-mode-alist |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2909 (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
|
2910 |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2911 (defvar ispell-minor-keymap |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2912 (let ((map (make-sparse-keymap))) |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2913 (define-key map " " 'ispell-minor-check) |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2914 (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
|
2915 map) |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2916 "Keymap used for Ispell minor mode.") |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2917 |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2918 (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
|
2919 (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
|
2920 (setq minor-mode-map-alist |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2921 (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
|
2922 minor-mode-map-alist))) |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2923 |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2924 ;;;###autoload |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2925 (defun ispell-minor-mode (&optional arg) |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2926 "Toggle Ispell minor mode. |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2927 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
|
2928 |
|
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2929 In Ispell minor mode, pressing SPC or RET |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2930 warns you if the previous word is incorrectly spelled. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2931 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2932 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
|
2933 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
|
2934 (interactive "P") |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2935 (setq ispell-minor-mode |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2936 (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
|
2937 (<= (prefix-numeric-value arg) 0)))) |
|
11562
8ff50a0715e1
(ispell-minor-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11469
diff
changeset
|
2938 (force-mode-line-update)) |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2939 |
|
8803
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2940 (defun ispell-minor-check () |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2941 "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
|
2942 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
|
2943 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
|
2944 (interactive "*") |
|
18bf41f29a7d
(ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents:
8725
diff
changeset
|
2945 (let ((ispell-minor-mode nil) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2946 (ispell-check-only t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2947 (last-char (char-after (1- (point))))) |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2948 (command-execute (key-binding (this-command-keys))) |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
2949 (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
|
2950 (and ispell-skip-html (eq last-char ?>)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
2951 (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
|
2952 (ispell-word nil t)))) |
| 6138 | 2953 |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2954 |
| 6138 | 2955 ;;; ********************************************************************** |
| 2956 ;;; Ispell Message | |
| 2957 ;;; ********************************************************************** | |
|
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2958 ;;; Original from D. Quinlan, E. Bradford, A. Albert, and M. Ernst |
|
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2959 |
| 6138 | 2960 |
|
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2961 (defvar ispell-message-text-end |
|
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2962 (mapconcat (function identity) |
|
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2963 '( |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2964 ;; Don't spell check signatures |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2965 "^-- $" |
|
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2966 ;; Matches postscript files. |
|
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2967 "^%!PS-Adobe-[123].0" |
|
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2968 ;; Matches uuencoded text |
|
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2969 "^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
|
2970 ;; Matches shell files (especially auto-decoding) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
2971 "^#! /bin/[ck]?sh" |
|
8387
7dca276b66d8
(ispell-message-text-end): Improve context diff regexp.
Richard M. Stallman <rms@gnu.org>
parents:
8298
diff
changeset
|
2972 ;; Matches context difference listing |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2973 "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2974 ;; Matches unidiff difference listing |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2975 "\\(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
|
2976 ;; Matches reporter.el bug report |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2977 "^current state:\n==============\n" |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2978 ;; Matches commonly used "cut" boundaries |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2979 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|Environment Follows\\)") |
|
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
2980 "\\|") |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
2981 "*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
|
2982 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
|
2983 Otherwise, it must be a function which is called to get the limit.") |
| 6138 | 2984 |
| 7606 | 2985 |
|
12260
5b8203bdfd6a
Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents:
11956
diff
changeset
|
2986 |
| 6138 | 2987 ;;;###autoload |
| 2988 (defun ispell-message () | |
| 2989 "Check the spelling of a mail message or news post. | |
| 2990 Don't check spelling of message headers except the Subject field. | |
| 2991 Don't check included messages. | |
| 2992 | |
|
15551
9cbd488c1872
(ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents:
15312
diff
changeset
|
2993 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
|
2994 use the `x' command. (Any subsequent regions will be checked.) |
| 7607 | 2995 The `X' command aborts the message send so that you can edit the buffer. |
| 6138 | 2996 |
| 2997 To spell-check whenever a message is sent, include the appropriate lines | |
| 2998 in your .emacs file: | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
2999 (add-hook 'message-send-hook 'ispell-message) ;; GNUS 5 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3000 (add-hook 'news-inews-hook 'ispell-message) ;; GNUS 4 |
| 6138 | 3001 (add-hook 'mail-send-hook 'ispell-message) |
| 3002 (add-hook 'mh-before-send-letter-hook 'ispell-message) | |
| 3003 | |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
3004 You can bind this to the key C-c i in GNUS or mail by adding to |
| 7607 | 3005 `news-reply-mode-hook' or `mail-mode-hook' the following lambda expression: |
| 6138 | 3006 (function (lambda () (local-set-key \"\\C-ci\" 'ispell-message)))" |
| 3007 (interactive) | |
|
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3008 (save-excursion |
| 7606 | 3009 (goto-char (point-min)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3010 (let* ( |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3011 ;; 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
|
3012 ;; Non-nil marker of end of headers. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3013 (internal-messagep |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3014 (re-search-forward |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3015 (concat "^" (regexp-quote mail-header-separator) "$") nil t)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3016 (end-of-headers ; Start of body. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3017 (copy-marker |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3018 (or internal-messagep |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3019 (re-search-forward "^$" nil t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3020 (point-min)))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3021 (limit (copy-marker ; End of region we will spell check. |
| 7606 | 3022 (cond |
| 3023 ((not ispell-message-text-end) (point-max)) | |
| 3024 ((char-or-string-p ispell-message-text-end) | |
| 3025 (if (re-search-forward ispell-message-text-end nil t) | |
| 3026 (match-beginning 0) | |
| 3027 (point-max))) | |
| 3028 (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
|
3029 (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
|
3030 (if (and (boundp 'mail-yank-prefix) mail-yank-prefix) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3031 (ispell-non-empty-string mail-yank-prefix) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3032 " \\|\t")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3033 (cite-regexp ;Prefix of quoted text |
|
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3034 (cond |
|
28616
313ef0d76864
(ispell-menu-map-needed): Check that ispell-process
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28563
diff
changeset
|
3035 ((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
|
3036 (concat "\\(" (sc-cite-regexp) "\\)" "\\|" |
|
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3037 (ispell-non-empty-string sc-reference-tag-string))) |
|
28616
313ef0d76864
(ispell-menu-map-needed): Check that ispell-process
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28563
diff
changeset
|
3038 ((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
|
3039 (concat "\\(" sc-cite-regexp "\\)" "\\|" |
|
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3040 (ispell-non-empty-string sc-reference-tag-string))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3041 ((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
|
3042 (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
|
3043 (concat "In article <" "\\|" |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3044 "[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3045 message-yank-prefix "\\|" |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3046 default-prefix)) |
|
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3047 ((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
|
3048 (concat "[^,;&+=\n]+ writes:" "\\|" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3049 (ispell-non-empty-string mh-ins-buf-prefix))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3050 ((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
|
3051 (concat "In [a-zA-Z.]+ you write:" "\\|" |
|
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3052 "In <[^,;&+=]+> [^,;&+=]+ writes:" "\\|" |
|
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3053 " *> *")) |
|
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3054 ((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
|
3055 (concat "[^,;&+=\n]+ writes:" "\\|" |
|
6139
120970aa0d16
(ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6138
diff
changeset
|
3056 (ispell-non-empty-string vm-included-text-prefix))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3057 (t default-prefix))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3058 (ispell-skip-region-alist |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3059 (cons (list (concat "^\\(" cite-regexp "\\)") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3060 (function forward-line)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3061 ispell-skip-region-alist)) |
| 7606 | 3062 (old-case-fold-search case-fold-search) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3063 (dictionary-alist ispell-message-dictionary-alist) |
| 7606 | 3064 (ispell-checking-message t)) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3065 |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3066 ;; Select dictionary for message |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3067 (or (local-variable-p 'ispell-local-dictionary (current-buffer)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3068 (while dictionary-alist |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3069 (goto-char (point-min)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3070 (if (re-search-forward (car (car dictionary-alist)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3071 end-of-headers t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3072 (setq ispell-local-dictionary (cdr (car dictionary-alist)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3073 dictionary-alist nil) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3074 (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
|
3075 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3076 (unwind-protect |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3077 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3078 ;; Spell check any original Subject: |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3079 (goto-char (point-min)) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3080 (setq case-fold-search t) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3081 (if (re-search-forward "^Subject: *" end-of-headers t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3082 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3083 (goto-char (match-end 0)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3084 (if (and (not (looking-at ".*Re\\>")) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3085 (not (looking-at "\\["))) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3086 (progn |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3087 (setq case-fold-search old-case-fold-search) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3088 (ispell-region (point) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3089 (progn ;Tab-initiated continuation lns. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3090 (end-of-line) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3091 (while (looking-at "\n[ \t]") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3092 (end-of-line 2)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3093 (point))))))) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3094 (setq case-fold-search old-case-fold-search) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3095 (goto-char end-of-headers) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3096 (forward-line 1) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3097 (ispell-region (point) limit)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3098 (set-marker end-of-headers nil) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3099 (set-marker limit nil))))) |
| 7606 | 3100 |
| 6138 | 3101 |
| 3102 (defun ispell-non-empty-string (string) | |
| 3103 (if (or (not string) (string-equal string "")) | |
| 3104 "\\'\\`" ; An unmatchable string if string is null. | |
| 3105 (regexp-quote string))) | |
| 3106 | |
| 3107 | |
| 3108 ;;; ********************************************************************** | |
| 3109 ;;; Buffer Local Functions | |
| 3110 ;;; ********************************************************************** | |
| 3111 | |
| 3112 | |
| 3113 (defun ispell-accept-buffer-local-defs () | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3114 "Load all buffer-local information, restarting Ispell when necessary." |
| 6138 | 3115 (ispell-buffer-local-dict) ; May kill ispell-process. |
| 3116 (ispell-buffer-local-words) ; Will initialize ispell-process. | |
| 3117 (ispell-buffer-local-parsing)) | |
| 3118 | |
| 3119 | |
| 3120 (defun ispell-buffer-local-parsing () | |
| 7607 | 3121 "Place Ispell into parsing mode for this buffer. |
| 7606 | 3122 Overrides the default parsing mode. |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3123 Includes Latex/Nroff modes and extended character mode." |
| 6138 | 3124 ;; (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
|
3125 (ispell-send-string "!\n") ; Put process in terse mode. |
| 6138 | 3126 ;; 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
|
3127 ;; 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
|
3128 (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
|
3129 (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
|
3130 (string-match "[Tt][Ee][Xx]-mode" |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3131 (symbol-name major-mode))) |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3132 (eq ispell-parser 'tex))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3133 (progn |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3134 (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
|
3135 (if (not (eq ispell-parser 'tex)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3136 (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
|
3137 (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
|
3138 ;; 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
|
3139 (if (and ispell-skip-html (not (eq ispell-skip-html t))) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3140 (set (make-local-variable 'ispell-skip-html) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3141 (not (null (string-match "sgml\\|html" |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3142 (downcase (symbol-name major-mode))))))) |
| 6138 | 3143 ;; Set default extended character mode for given buffer, if any. |
| 3144 (let ((extended-char-mode (ispell-get-extended-character-mode))) | |
| 3145 (if extended-char-mode | |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3146 (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
|
3147 ;; Set buffer-local parsing mode and extended character mode, if specified. |
| 6138 | 3148 (save-excursion |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3149 (goto-char (point-max)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3150 ;; Uses last occurrence of ispell-parsing-keyword |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3151 (if (search-backward ispell-parsing-keyword nil t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3152 (let ((end (save-excursion (end-of-line) (point))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3153 string) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3154 (search-forward ispell-parsing-keyword) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3155 (while (re-search-forward " *\\([^ \"]+\\)" end t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3156 ;; space separated definitions. |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3157 (setq string (downcase (buffer-substring-no-properties |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3158 (match-beginning 1) (match-end 1)))) |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3159 (cond ((and (string-match "latex-mode" string) |
|
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3160 (not (eq 'exclusive ispell-check-comments))) |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3161 (ispell-send-string "+\n~tex\n")) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3162 ((string-match "nroff-mode" string) |
|
28563
7d8ea470609b
(ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents:
27260
diff
changeset
|
3163 (ispell-send-string "-\n~nroff\n")) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3164 ((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
|
3165 (ispell-send-string (concat string "\n"))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3166 (t (message "Invalid Ispell Parsing argument!") |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3167 (sit-for 2)))))))) |
| 6138 | 3168 |
| 3169 | |
| 3170 ;;; Can kill the current ispell process | |
| 3171 | |
| 3172 (defun ispell-buffer-local-dict () | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3173 "Initializes local dictionary and local personal dictionary. |
| 6138 | 3174 When a dictionary is defined in the buffer (see variable |
| 7607 | 3175 `ispell-dictionary-keyword'), it will override the local setting |
| 6138 | 3176 from \\[ispell-change-dictionary]. |
| 3177 Both should not be used to define a buffer-local dictionary." | |
| 3178 (save-excursion | |
| 3179 (goto-char (point-min)) | |
| 3180 (let (end) | |
| 3181 ;; Override the local variable definition. | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3182 ;; Uses last occurrence of ispell-dictionary-keyword. |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3183 (goto-char (point-max)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3184 (if (search-backward ispell-dictionary-keyword nil t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3185 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3186 (search-forward ispell-dictionary-keyword) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3187 (setq end (save-excursion (end-of-line) (point))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3188 (if (re-search-forward " *\\([^ \"]+\\)" end t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3189 (setq ispell-local-dictionary |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3190 (buffer-substring-no-properties (match-beginning 1) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3191 (match-end 1)))))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3192 (goto-char (point-max)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3193 (if (search-backward ispell-pdict-keyword nil t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3194 (progn |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3195 (search-forward ispell-pdict-keyword) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3196 (setq end (save-excursion (end-of-line) (point))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3197 (if (re-search-forward " *\\([^ \"]+\\)" end t) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3198 (setq ispell-local-pdict |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3199 (buffer-substring-no-properties (match-beginning 1) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3200 (match-end 1)))))))) |
| 6138 | 3201 ;; Reload if new personal dictionary defined. |
| 3202 (if (and ispell-local-pdict | |
| 3203 (not (equal ispell-local-pdict ispell-personal-dictionary))) | |
| 3204 (progn | |
| 3205 (ispell-kill-ispell t) | |
| 3206 (setq ispell-personal-dictionary ispell-local-pdict))) | |
| 3207 ;; Reload if new dictionary defined. | |
| 3208 (if (and ispell-local-dictionary | |
| 3209 (not (equal ispell-local-dictionary ispell-dictionary))) | |
| 3210 (ispell-change-dictionary ispell-local-dictionary))) | |
| 3211 | |
| 3212 | |
| 3213 (defun ispell-buffer-local-words () | |
| 7607 | 3214 "Loads the buffer-local dictionary in the current buffer." |
| 6138 | 3215 (if (and ispell-buffer-local-name |
| 3216 (not (equal ispell-buffer-local-name (buffer-name)))) | |
| 3217 (progn | |
| 3218 (ispell-kill-ispell t) | |
| 3219 (setq ispell-buffer-local-name nil))) | |
| 3220 (ispell-init-process) | |
| 3221 (save-excursion | |
| 3222 (goto-char (point-min)) | |
| 3223 (while (search-forward ispell-words-keyword nil t) | |
| 3224 (or ispell-buffer-local-name | |
| 3225 (setq ispell-buffer-local-name (buffer-name))) | |
| 3226 (let ((end (save-excursion (end-of-line) (point))) | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3227 (ispell-casechars (ispell-get-casechars)) |
| 6138 | 3228 string) |
|
10136
37fa43bb8056
Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents:
9718
diff
changeset
|
3229 ;; 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
|
3230 ;; 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
|
3231 (while (re-search-forward " *\\([^ ]+\\)" end t) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3232 (setq string (buffer-substring-no-properties (match-beginning 1) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3233 (match-end 1))) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3234 ;; 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
|
3235 ;; 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
|
3236 (if (and (< 1 (length string)) |
|
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3237 (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
|
3238 (ispell-send-string (concat "@" string "\n")))))))) |
| 6138 | 3239 |
| 3240 | |
| 3241 ;;; returns optionally adjusted region-end-point. | |
| 3242 | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3243 (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
|
3244 "Add WORD to the per-file word list." |
| 6138 | 3245 (or ispell-buffer-local-name |
| 3246 (setq ispell-buffer-local-name (buffer-name))) | |
| 3247 (save-excursion | |
| 3248 (goto-char (point-min)) | |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3249 (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
|
3250 line-okay search done found) |
| 6138 | 3251 (while (not done) |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3252 (setq case-fold-search nil |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3253 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
|
3254 found (or found search) |
| 6138 | 3255 line-okay (< (+ (length word) 1 ; 1 for space after word.. |
| 3256 (progn (end-of-line) (current-column))) | |
|
23791
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3257 80) |
|
364d36c8f631
Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents:
23692
diff
changeset
|
3258 case-fold-search old-case-fold-search) |
| 6138 | 3259 (if (or (and search line-okay) |
| 3260 (null search)) | |
| 3261 (progn | |
| 3262 (setq done t) | |
| 3263 (if (null search) | |
| 3264 (progn | |
| 3265 (open-line 1) | |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3266 (unless found (newline)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3267 (insert (concat comment-start " " ispell-words-keyword)) |
|
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3268 (if (> (length comment-end) 0) |
| 6138 | 3269 (save-excursion |
|
30929
3d5ccbaddc59
Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents:
30803
diff
changeset
|
3270 (newline) |
| 6138 | 3271 (insert comment-end))))) |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3272 (insert (concat " " word)))))))) |
| 6138 | 3273 |
| 29078 | 3274 (add-to-list 'debug-ignored-errors "^No word found to check!$") |
| 6138 | 3275 |
| 3276 (provide 'ispell) | |
| 3277 | |
| 3278 | |
| 3279 ;;; LOCAL VARIABLES AND BUFFER-LOCAL VALUE EXAMPLES. | |
| 3280 | |
| 3281 ;;; Local Variable options: | |
| 3282 ;;; mode: name(-mode) | |
| 3283 ;;; eval: expression | |
| 3284 ;;; local-variable: value | |
| 3285 | |
|
24701
04e6bb1f69e1
(ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents:
24468
diff
changeset
|
3286 ;;; 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
|
3287 ;;; and spell checks only comments. |
| 6138 | 3288 |
| 3289 ;;; Local Variables: | |
| 3290 ;;; mode: emacs-lisp | |
| 3291 ;;; comment-column: 40 | |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3292 ;;; ispell-check-comments: exclusive |
|
27260
ec1a21729421
(xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents:
27009
diff
changeset
|
3293 ;;; ispell-local-dictionary: "american" |
| 6138 | 3294 ;;; End: |
| 3295 | |
| 3296 | |
| 3297 ;;; MORE EXAMPLES OF ISPELL BUFFER-LOCAL VALUES | |
| 3298 | |
| 3299 ;;; The following places this file in nroff parsing and extended char modes. | |
| 3300 ;;; Local IspellParsing: nroff-mode ~nroff | |
| 3301 ;;; Change IspellPersDict to IspellPersDict: to enable the following line. | |
| 3302 ;;; Local IspellPersDict ~/.ispell_lisp | |
| 3303 ;;; 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
|
3304 ; 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
|
3305 ; 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
|
3306 ; 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
|
3307 ; 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
|
3308 ; 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
|
3309 ; 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
|
3310 ; 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
|
3311 ; LocalWords: lns XEmacs HTML casechars Multibyte |
| 6138 | 3312 |
|
21873
3ab8be88f2ef
Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents:
21592
diff
changeset
|
3313 ;;; ispell.el ends here |
