annotate lisp/textmodes/ispell.el @ 28293:14eccbd25cae

(Fvertical_motion): Always use the current buffer. Temporarily change the window's buffer, if necessary.
author Gerd Moellmann <gerd@gnu.org>
date Fri, 24 Mar 2000 13:30:08 +0000
parents ec1a21729421
children 7d8ea470609b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
84acc3adcd63 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 13092
diff changeset
2
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3 ;; Copyright (C) 1994, 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
13337
84acc3adcd63 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 13092
diff changeset
4
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
5 ;; Authors : Ken Stevens <k.stevens@ieee.org>
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
6 ;; Stevens Mod Date: Mon 29 Nov 11:38:34 PST 1999
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
7 ;; Stevens Revision: 3.3
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
8 ;; 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
9 ;; Bug Reports : ispell-el-bugs@itcorp.com
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
10 ;; Web Site : http://kdstevens.com/~stevens/ispell-page.html
13337
84acc3adcd63 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 13092
diff changeset
11
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
12 ;; This file is part of GNU Emacs.
13337
84acc3adcd63 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 13092
diff changeset
13
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
14 ;; GNU Emacs is free software; you can redistribute it and/or modify
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
15 ;; it under the terms of the GNU General Public License as published by
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
16 ;; the Free Software Foundation; either version 2, or (at your option)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
17 ;; any later version.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
18
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
19 ;; GNU Emacs is distributed in the hope that it will be useful,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
22 ;; GNU General Public License for more details.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
23
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
24 ;; You should have received a copy of the GNU General Public License
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
25 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
26 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
27 ;; Boston, MA 02111-1307, USA.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
28
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
29 ;; 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
30 ;; when this file is edited for release with GNU emacs.
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
31
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
32 ;;; Commentary:
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
33
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
34 ;; INSTRUCTIONS
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
35
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
36 ;; 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
37 ;; 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
38 ;; 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
39 ;; of the users. Otherwise the users may need to set a number of variables
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
40 ;; themselves.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
41 ;; You particularly may want to change the default dictionary for your
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
42 ;; country and language.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
43 ;; 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
44 ;; 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
45 ;; 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
46 ;; 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
47
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
48 ;; Depending on the mail system you use, you may want to include these:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
49 ;; (add-hook 'news-inews-hook 'ispell-message)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
50 ;; (add-hook 'mail-send-hook 'ispell-message)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
51 ;; (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
52
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
53 ;; Ispell has a TeX parser and a nroff parser (the default).
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
54 ;; The parsing is controlled by the variable ispell-parser. Currently
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
55 ;; it is just a "toggle" between TeX and nroff, but if more parsers are
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
56 ;; 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
57
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
58
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
59 ;; TABLE OF CONTENTS
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
60
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
61 ;; ispell-word
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
62 ;; ispell-region
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
63 ;; ispell-buffer
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
64 ;; ispell-message
20389
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
65 ;; ispell-comments-and-strings
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
66 ;; ispell-continue
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
67 ;; ispell-complete-word
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
68 ;; ispell-complete-word-interior-frag
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
69 ;; ispell-change-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
70 ;; ispell-kill-ispell
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
71 ;; ispell-pdict-save
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
72 ;; ispell-skip-region-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
73
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
74 ;; Commands in ispell-region:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
75 ;; 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
76 ;; ` ': Accept word this time.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
77 ;; `i': Accept word and insert into private dictionary.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
78 ;; `a': Accept word for this session.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
79 ;; `A': Accept word and place in buffer-local dictionary.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
80 ;; `r': Replace word with typed-in value. Rechecked.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
81 ;; `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
82 ;; `?': Show these commands
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
83 ;; `x': Exit spelling buffer. Move cursor to original point.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
84 ;; `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
85 ;; the check to be completed later.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
86 ;; `q': Quit spelling session (Kills ispell process).
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
87 ;; `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
88 ;; `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
89 ;; `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
90 ;; `C-l': redraws screen
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
91 ;; `C-r': recursive edit
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
92 ;; `C-z': suspend emacs or iconify frame
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
93
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
94 ;; Buffer-Local features:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
95 ;; There are a number of buffer-local features that can be used to customize
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
96 ;; ispell for the current buffer. This includes language dictionaries,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
97 ;; personal dictionaries, parsing, and local word spellings. Each of these
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
98 ;; local customizations are done either through local variables, or by
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
99 ;; including the keyword and argument(s) at the end of the buffer (usually
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
100 ;; prefixed by the comment characters). See the end of this file for
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
101 ;; examples. The local keywords and variables are:
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
102
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
103 ;; ispell-dictionary-keyword language-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
104 ;; uses local variable ispell-local-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
105 ;; ispell-pdict-keyword personal-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
106 ;; uses local variable ispell-local-pdict
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
107 ;; ispell-parsing-keyword mode-arg extended-char-arg
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
108 ;; 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
109
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
110 ;; Region skipping:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
111 ;; 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
112 ;; 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
113 ;; 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
114 ;; `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
115
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
116 ;; BUGS:
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
117 ;; 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
118 ;; dictionary entries.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
119 ;; 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
120 ;; evil "misalignment error" in some versions of MULE emacs.
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
121 ;; 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
122 ;; see `ispell-help-in-bufferp'.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
123 ;; 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
124 ;; can cause misalignment errors.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
125
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
126 ;; HISTORY
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 ;; Modifications made in latest versions:
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
129
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
130 ;; Revision 3.3 1999/11/29 11:38:34 kss
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
131 ;; Only word replacements entered in from the keyboard are rechecked.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
132 ;; This fixes a bug in tex parsing and misalignment.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
133 ;; 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
134 ;; condition tested. Recursive editing improved.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
135 ;; XEmacs repair for when `enable-multibyte-characters' defined - Didier Verna.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
136 ;; 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
137 ;; 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
138 ;; 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
139 ;; fonts.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
140
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
141 ;; 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
142 ;; 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
143 ;; 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
144 ;; 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
145 ;; 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
146 ;; Removed calls to `when' macro.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
147
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
148 ;; 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
149 ;; Improved and fixed customize support.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
150 ;; 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
151 ;; 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
152 ;; 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
153 ;; Dictionary norsk7-tex removed. Dictionary polish added.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
154 ;; 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
155 ;; 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
156 ;; 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
157 ;; 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
158 ;; 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
159 ;; 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
160 ;; 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
161 ;; 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
162 ;; 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
163 ;; This can otherwise confuse process filters and hang ispell.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
164 ;; Improved skipping support for SGML.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
165 ;; 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
166 ;; Improved message reference matching in `ispell-message'.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
167 ;; Fixed bug in returning to nroff mode from tex mode.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
168
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
169
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
170 ;;; Code:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
171
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
172 ;;; 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
173 ;;; Add in backward compatible custom support.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
174 (eval-when-compile
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
175 (if (not (fboundp 'defcustom))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
176 (defmacro defcustom (symbol value doc &rest args)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
177 "Empty replacement for defcustom when not supplied."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
178 `(defvar ,symbol ,value ,doc))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
179
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
180 (eval-when-compile
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
181 (if (fboundp 'defgroup)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
182 (defgroup ispell nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
183 "User variables for emacs ispell interface."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
184 :group 'applications)))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
185
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
186
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
187 ;;;###autoload
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
188 (defconst ispell-xemacsp (string-match "Lucid\\|XEmacs" emacs-version)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
189 "Non nil if using XEmacs.")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
190
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
191 ;;;###autoload
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
192 (defconst ispell-version18p (string-match "18\\.[0-9]+\\.[0-9]+" emacs-version)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
193 "Non nil if using emacs version 18.")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
194
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
195 ;;;###autoload
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
196 (defconst ispell-version20p (string-match "20\\.[0-9]+\\.[0-9]+" emacs-version)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
197 "Non nil if using emacs version 20.")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
198
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
199
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
200 ;;; **********************************************************************
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
201 ;;; 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
202 ;;; and location of binaries:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
203 ;;; **********************************************************************
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
204
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
205
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
206 ;;; ******* 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
207
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
208 (defcustom ispell-highlight-p 'block
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
209 "*Highlight spelling errors when non-nil.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
210 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
211 :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
212 :group 'ispell)
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
213
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
214 (defcustom ispell-highlight-face 'highlight
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
215 "*The face used for Ispell highlighting. For Emacses with overlays.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
216 Possible values are `highlight', `modeline', `secondary-selection',
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
217 `region', and `underline'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
218 This variable can be set by the user to whatever face they desire.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
219 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
220 slightly different."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
221 :type 'face
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
222 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
223
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
224 (defcustom ispell-check-comments t
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
225 "*Spelling of comments checked when non-nil.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
226 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
227 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
228 may produce undesired results."
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
229 :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
230 :group 'ispell)
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
231
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
232 (defcustom ispell-query-replace-choices nil
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
233 "*Corrections made throughout region when non-nil.
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
234 Uses `query-replace' (\\[query-replace]) for corrections."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
235 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
236 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
237
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
238 (defcustom ispell-skip-tib nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
239 "*Does not spell check `tib' bibliography references when non-nil.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
240 Skips any text between strings matching regular expressions
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
241 `ispell-tib-ref-beginning' and `ispell-tib-ref-end'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
242
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
243 TeX users beware: Any field starting with [. will skip until a .] -- even
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
244 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
245 a [.5mm] type of number...."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
246 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
247 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
248
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
249 (defvar ispell-tib-ref-beginning "[[<]\\."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
250 "Regexp matching the beginning of a Tib reference.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
251
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
252 (defvar ispell-tib-ref-end "\\.[]>]"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
253 "Regexp matching the end of a Tib reference.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
254
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
255 (defcustom ispell-keep-choices-win t
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
256 "*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
257 This minimizes redisplay thrashing."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
258 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
259 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
260
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
261 (defcustom ispell-choices-win-default-height (if ispell-xemacsp 3 2)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
262 "*The default size of the `*Choices*' window, including mode line.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
263 Must be greater than 1.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
264 XEmacs modeline is thicker than a line of text, so it partially covers the
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
265 last line of text in the buffer. Include an extra line in XEmacs to see
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
266 all of the choices clearly."
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
267 :type 'integer
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
268 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
269
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
270 (defcustom ispell-program-name "ispell"
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
271 "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
272 :type 'string
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
273 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
274
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
275 (defcustom ispell-alternate-dictionary
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
276 (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
277 ((file-exists-p "/usr/share/dict/web2") "/usr/share/dict/web2")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
278 ((file-exists-p "/usr/dict/words") "/usr/dict/words")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
279 ((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
280 ((file-exists-p "/usr/share/dict/words") "/usr/share/dict/words")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
281 ((file-exists-p "/sys/dict") "/sys/dict")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
282 (t "/usr/dict/words"))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
283 "*Alternate dictionary for spelling help."
24795
a7afe99e73cf (ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents: 24737
diff changeset
284 :type '(choice file (const :tag "None" nil))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
285 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
286
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
287 (defcustom ispell-complete-word-dict ispell-alternate-dictionary
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
288 "*Dictionary used for word completion."
24795
a7afe99e73cf (ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents: 24737
diff changeset
289 :type '(choice file (const :tag "None" nil))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
290 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
291
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
292 (defcustom ispell-message-dictionary-alist nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
293 "*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
294 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
295 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
296 DICTIONARY if `ispell-local-dictionary' is not buffer-local.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
297 E.g. you may use the following value:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
298 '((\"^Newsgroups:[ \\t]*de\\\\.\" . \"deutsch8\")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
299 (\"^To:[^\\n,]+\\\\.de[ \\t\\n,>]\" . \"deutsch8\"))"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
300 :type '(repeat (cons regexp string))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
301 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
302
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
303
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
304 (defcustom ispell-grep-command "egrep"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
305 "Name of the grep command for search processes."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
306 :type 'string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
307 :group 'ispell)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
308
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
309 (defcustom ispell-grep-options "-i"
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
310 "String of options to use when running the program in `ispell-grep-command'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
311 Should probably be \"-i\" or \"-e\".
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
312 Some machines (like the NeXT) don't support \"-i\""
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
313 :type 'string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
314 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
315
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
316 (defcustom ispell-look-command
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
317 (cond ((file-exists-p "/bin/look") "/bin/look")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
318 ((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
319 ((file-exists-p "/usr/bin/look") "/usr/bin/look")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
320 (t "look"))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
321 "Name of the look command for search processes.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
322 This must be an absolute file name."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
323 :type 'file
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
324 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
325
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
326 (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
327 "*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
328 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
329 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
330 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
331
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
332 (defcustom ispell-have-new-look nil
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
333 "*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
334 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
335 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
336
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
337 (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
338 "String of command options for `ispell-look-command'."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
339 :type 'string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
340 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
341
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
342 (defcustom ispell-use-ptys-p nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
343 "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
344 When nil, Emacs uses pipes."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
345 :type 'boolean
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
346 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
347
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
348 (defcustom ispell-following-word nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
349 "*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
350 Otherwise `ispell-word' checks the preceding word."
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
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
353
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
354 (defcustom ispell-help-in-bufferp nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
355 "*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
356 The following values are supported:
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
357 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
358 there for a couple of seconds.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
359 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
360 for a couple of seconds.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
361 electric Pop up a new buffer and display a long help message there.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
362 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
363 :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
364 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
365
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
366 (defcustom ispell-quietly nil
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
367 "*Non-nil means suppress messages in `ispell-word'."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
368 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
369 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
370
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
371 (defcustom ispell-format-word (function upcase)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
372 "*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
373 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
374 :type 'function
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
375 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
376
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
377 (defcustom ispell-use-framepop-p nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
378 "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
379 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
380 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
381 (and window-system (condition-case () (require 'framepop) (error nil)))"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
382 :type 'boolean
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
383 :group 'ispell)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
384
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
385 ;;;###autoload
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
386 (defcustom ispell-personal-dictionary nil
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
387 "*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
388 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
389 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
390 :type '(choice file
fa6f38bb8ac1 (ispell-personal-dictionary): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19785
diff changeset
391 (const :tag "default" nil))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
392 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
393
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
394 (defcustom ispell-silently-savep nil
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
395 "*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
396 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
397 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
398
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
399 ;;; 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
400 ;;; 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
401 (defcustom ispell-local-dictionary nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
402 "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
403 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
404 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
405
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
406 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
407 calling \\[ispell-change-dictionary] with that value. This variable
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
408 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
409 `ispell-dictionary-keyword' or the Local Variable syntax.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
410
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
411 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
412 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
413 :type '(choice string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
414 (const :tag "default" nil))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
415 :group 'ispell)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
416
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
417 (make-variable-buffer-local 'ispell-local-dictionary)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
418
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
419 ;; 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
420 ;;(set-default 'ispell-local-dictionary nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
421
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
422
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
423 (defcustom ispell-extra-args nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
424 "*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
425 For example, (\"-W\" \"3\") to cause it to accept all 1-3 character
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
426 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
427 for language-specific arguments."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
428 :type '(repeat string)
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
429 :group 'ispell)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
430
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
431
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
432 ;;; 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
433 ;;;###autoload
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
434 (defcustom ispell-local-dictionary-alist nil
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
435 "*Contains local or customized dictionary definitions.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
436 See `ispell-dictionary-alist'."
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
437 :type '(repeat (list (choice :tag "Dictionary"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
438 (string :tag "Dictionary name")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
439 (const :tag "default" nil))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
440 (regexp :tag "Case characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
441 (regexp :tag "Non case characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
442 (regexp :tag "Other characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
443 (boolean :tag "Many other characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
444 (repeat :tag "Ispell command line args"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
445 (string :tag "Arg"))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
446 (choice :tag "Extended character mode"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
447 (const "~tex") (const "~plaintex")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
448 (const "~nroff") (const "~list")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
449 (const "~latin1") (const "~latin3")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
450 (const :tag "default" nil))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
451 (choice :tag "Character set"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
452 (const iso-8859-1)
24942
517194c6cdc6 (ispell-dictionary-alist-6): Change charset for Russian.
Richard M. Stallman <rms@gnu.org>
parents: 24795
diff changeset
453 (const iso-8859-2)
517194c6cdc6 (ispell-dictionary-alist-6): Change charset for Russian.
Richard M. Stallman <rms@gnu.org>
parents: 24795
diff changeset
454 (const koi8-r))))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
455 :group 'ispell)
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
456
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
457
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
458 ;;; 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
459
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
460 ;;; 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
461 ;;;###autoload
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
462 (setq
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
463 ispell-dictionary-alist-1
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
464 '((nil ; default (English.aff)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
465 "[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
466 ("american" ; Yankee English
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
467 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
468 ("brasiliano" ; Brazilian mode
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
469 "[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
470 "[^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
471 "[']" 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
472 ("british" ; British version
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
473 "[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
474 ("castellano" ; Spanish mode
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
475 "[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
476 "[^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
477 "[---]" nil ("-B" "-d" "castellano") "~tex" iso-8859-1)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
478 ("castellano8" ; 8 bit Spanish mode
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
479 "[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
480 "[^A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]"
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
481 "[---]" nil ("-B" "-d" "castellano") "~latin1" iso-8859-1)))
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
482
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
483
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
484 ;;; 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
485 ;;;###autoload
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
486 (setq
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
487 ispell-dictionary-alist-2
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
488 '(("czech"
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
489 "[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
490 "[^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
491 "" 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
492 ("dansk" ; Dansk.aff
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
493 "[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
494 "[']" nil ("-C") nil iso-8859-1)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
495 ("deutsch" ; Deutsch.aff
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
496 "[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
497 ("deutsch8"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
498 "[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
499 "[^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
500 "[']" 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
501 ("english" ; make English explicitly selectable
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
502 "[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
503
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
504
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
505 ;;; 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
506 ;;;###autoload
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
507 (setq
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
508 ispell-dictionary-alist-3
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
509 '(("esperanto"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
510 "[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
511 "[^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
512 "[-']" t ("-C") "~latin3" iso-8859-1)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
513 ("esperanto-tex"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
514 "[A-Za-z^\\]" "[^A-Za-z^\\]"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
515 "[-'`\"]" 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
516 ("francais7"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
517 "[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
518 ("francais" ; Francais.aff
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
519 "[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
520 "[^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]"
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
521 "[---']" t nil "~list" iso-8859-1)))
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
522
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
523
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
524 ;;; 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
525 ;;;###autoload
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
526 (setq
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
527 ispell-dictionary-alist-4
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
528 '(("francais-tex" ; Francais.aff
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
529 "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
530 "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
531 "[---'^`\"]" t nil "~tex" iso-8859-1)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
532 ("nederlands" ; Nederlands.aff
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
533 "[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
534 "[^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
535 "[']" t ("-C") nil iso-8859-1)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
536 ("nederlands8" ; Dutch8.aff
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
537 "[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
538 "[^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
539 "[']" t ("-C") nil iso-8859-1)))
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
540
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
541
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
542 ;;; 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
543 ;;;###autoload
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
544 (setq
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
545 ispell-dictionary-alist-5
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
546 '(("norsk" ; 8 bit Norwegian mode
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
547 "[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
548 "[^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
549 "[\"]" nil ("-d" "norsk") "~list" iso-8859-1)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
550 ("norsk7-tex" ; 7 bit Norwegian TeX mode
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
551 "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
552 "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
553 ("polish" ; polish mode
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
554 "[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
555 "[^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
556 "" nil ( "-d" "polish") nil iso-8859-2)))
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
557
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
558
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
559 ;;; 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
560 ;;;###autoload
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
561 (setq
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
562 ispell-dictionary-alist-6
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
563 ;; include Russian iso character set too?
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
564 ;; "[']" 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
565 '(("russian" ; Russian.aff (KOI8-R charset)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
566 "[\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
567 "[^\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
568 "" nil ("-d" "russian") nil koi8-r)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
569 ("svenska" ; Swedish mode
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
570 "[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
571 "[^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
572 "[']" nil ("-C") "~list" iso-8859-1)))
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
573
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
574
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
575
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
576 ;;;###autoload
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
577 (defcustom ispell-dictionary-alist
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
578 (append ispell-local-dictionary-alist ; dictionary customizations
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
579 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
580 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
581 ispell-dictionary-alist-5 ispell-dictionary-alist-6)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
582 "An alist of dictionaries and their associated parameters.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
583
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
584 Each element of this list is also a list:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
585
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
586 \(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
587 ISPELL-ARGS EXTENDED-CHARACTER-MODE CHARACTER-SET\)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
588
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
589 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
590 nil means the default dictionary.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
591
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
592 CASECHARS is a regular expression of valid characters that comprise a
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
593 word.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
594
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
595 NOT-CASECHARS is the opposite regexp of CASECHARS.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
596
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
597 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
598 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
599 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
600 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
601 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
602 \"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
603 \"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
604 If you want OTHERCHARS to be empty, use the empty string.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
605 Hint: regexp syntax requires the hyphen to be declared first here.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
606
19183
aaf5a3f7a2bd (ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 17955
diff changeset
607 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
608 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
609 single word.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
610
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
611 ISPELL-ARGS is a list of additional arguments passed to the ispell
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
612 subprocess.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
613
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
614 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
615 have been configured in an Ispell affix file. (For example, umlauts
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
616 can be encoded as \\\"a, a\\\", \"a, ...) Defaults are ~tex and ~nroff
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
617 in English. This has the same effect as the command-line `-T' option.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
618 The buffer Major Mode controls Ispell's parsing in tex or nroff mode,
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
619 but the dictionary can control the extended character mode.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
620 Both defaults can be overruled in a buffer-local fashion. See
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
621 `ispell-parsing-keyword' for details on this.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
622
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
623 CHARACTER-SET used for languages with multibyte characters.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
624
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
625 Note that the CASECHARS and OTHERCHARS slots of the alist should
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
626 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
627 LANGUAGE.aff file \(e.g., english.aff\)."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
628 :type '(repeat (list (choice :tag "Dictionary"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
629 (string :tag "Dictionary name")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
630 (const :tag "default" nil))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
631 (regexp :tag "Case characters")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
632 (regexp :tag "Non case characters")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
633 (regexp :tag "Other characters")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
634 (boolean :tag "Many other characters")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
635 (repeat :tag "Ispell command line args"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
636 (string :tag "Arg"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
637 (choice :tag "Extended character mode"
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
638 (const "~tex") (const "~plaintex")
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
639 (const "~nroff") (const "~list")
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
640 (const "~latin1") (const "~latin3")
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
641 (const :tag "default" nil))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
642 (choice :tag "Character set"
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
643 (const iso-8859-1)
26442
797d877746e1 (ispell-dictionary-alist): Fix type by adding koi8-r
Gerd Moellmann <gerd@gnu.org>
parents: 25943
diff changeset
644 (const iso-8859-2)
797d877746e1 (ispell-dictionary-alist): Fix type by adding koi8-r
Gerd Moellmann <gerd@gnu.org>
parents: 25943
diff changeset
645 (const koi8-r))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
646 :group 'ispell)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
647
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
648 ;;; update the dictionaries at load time
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
649 (setq ispell-dictionary-alist
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
650 (append ispell-local-dictionary-alist ; dictionary customizations
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
651 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
652 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
653 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
654
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
655 ;;; The preparation of the menu bar menu must be autoloaded
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
656 ;;; because otherwise this file gets autoloaded every time Emacs starts
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
657 ;;; so that it can set up the menus and determine keyboard equivalents.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
658
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
659
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
660 ;;; 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
661 ;;; 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
662 (defconst ispell-required-version '(3 1 12)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
663 "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
664 (defvar ispell-offset -1
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
665 "Offset that maps protocol differences between ispell 3.1 versions.")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
666
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
667 (defconst ispell-version "ispell.el 3.3 -- Mon 29 Nov 11:38:34 PST 1999")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
668
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
669
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
670 (defun check-ispell-version (&optional interactivep)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
671 "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
672 Returns version number if called interactively.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
673 Otherwise returns the library path if defined."
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
674 ;; 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
675 ;; 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
676 ;; 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
677 ;; 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
678 ;; 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
679 ;; 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
680 ;; themselves on startup.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
681 (interactive "p")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
682 (let ((case-fold-search-val case-fold-search)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
683 ;; avoid bugs when syntax of `.' changes in various default modes
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
684 (default-major-mode 'fundamental-mode)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
685 result status)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
686 (save-excursion
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
687 (set-buffer (get-buffer-create " *ispell-tmp*"))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
688 (erase-buffer)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
689 (setq status (call-process ispell-program-name nil t nil "-vv"))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
690 (goto-char (point-min))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
691 (if interactivep
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
692 (progn
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
693 (end-of-line)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
694 (setq result (concat (buffer-substring-no-properties (point-min)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
695 (point))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
696 ", "
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
697 ispell-version))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
698 (message result))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
699 ;; return library path.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
700 (re-search-forward "LIBDIR = \\\"\\([^ \t\n]*\\)\\\"" nil t)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
701 (if (match-beginning 0)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
702 (setq result (buffer-substring (match-beginning 1) (match-end 1)))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
703 (goto-char (point-min))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
704 (if (not (memq status '(0 nil)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
705 (error "%s exited with %s %s" ispell-program-name
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
706 (if (stringp status) "signal" "code") status))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
707 (setq case-fold-search t
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
708 status (re-search-forward
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
709 (concat "\\<\\("
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
710 (format "%d" (car ispell-required-version))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
711 "\\)\\.\\([0-9]*\\)\\.\\([0-9]*\\)\\>")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
712 nil t)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
713 case-fold-search case-fold-search-val)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
714 (if (or (not status) ; major version mismatch
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
715 (< (car (read-from-string (buffer-substring-no-properties
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
716 (match-beginning 2) (match-end 2))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
717 (car (cdr ispell-required-version)))) ; minor version mismatch
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
718 (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
719 ispell-program-name (car ispell-required-version)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
720 (car (cdr ispell-required-version))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
721 (car (cdr (cdr ispell-required-version))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
722 ;; check that it is the correct version.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
723 (if (and (= (car (read-from-string (buffer-substring-no-properties
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
724 (match-beginning 2)(match-end 2))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
725 (car (cdr ispell-required-version)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
726 (< (car (read-from-string (buffer-substring-no-properties
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
727 (match-beginning 3)(match-end 3))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
728 (car (cdr (cdr ispell-required-version)))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
729 (setq ispell-offset 0)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
730 (kill-buffer (current-buffer)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
731 result))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
732
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
733
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
734 ;;;###autoload
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
735 (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
736 ;;; redo menu when loading ispell to get dictionary modifications
23847
8d6ae4ca21a7 Take out the eval-when's.
Karl Heuer <kwzh@gnu.org>
parents: 23841
diff changeset
737 (setq ispell-menu-map nil)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
738
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
739 ;;;###autoload
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
740 (defvar ispell-menu-xemacs nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
741 "Spelling menu for XEmacs.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
742 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
743 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
744
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
745 ;;; 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
746 ;;; 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
747
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
748 ;;; Set up dictionary
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
749 ;;;###autoload
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
750 (defvar ispell-menu-map-needed
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
751 ;; 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
752 (and (not ispell-menu-map)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
753 (not ispell-version18p)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
754 (not ispell-xemacsp)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
755 'reload))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
756
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
757 (defvar ispell-library-path (check-ispell-version)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
758 "The directory where ispell dictionaries reside.")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
759
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
760
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
761 ;;;###autoload
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
762 (if ispell-menu-map-needed
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
763 (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
764 ;; `ispell-library-path' intentionally not defined in autoload
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
765 (path (and (boundp 'ispell-library-path) ispell-library-path))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
766 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
767 (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
768 ;; 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
769 (while dicts
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
770 (setq name (car (car dicts))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
771 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
772 dicts (cdr dicts))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
773 (cond ((not (stringp name))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
774 (define-key ispell-menu-map (vector 'default)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
775 (cons "Select Default Dict"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
776 (list 'lambda () '(interactive)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
777 (list 'ispell-change-dictionary "default")))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
778 ((or (not path) ; load all if library dir not defined
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
779 (file-exists-p (concat path "/" name ".hash"))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
780 (file-exists-p (concat path "/" name ".has"))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
781 (and load-dict
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
782 (or (file-exists-p(concat path "/" load-dict ".hash"))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
783 (file-exists-p(concat path "/" load-dict ".has")))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
784 (define-key ispell-menu-map (vector (intern name))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
785 (cons (concat "Select " (capitalize name))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
786 (list 'lambda () '(interactive)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
787 (list 'ispell-change-dictionary name)))))))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
788
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
789
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
790 ;;; 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
791 ;;;###autoload
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
792 (if ispell-menu-map-needed
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
793 (progn
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
794 (define-key ispell-menu-map [ispell-change-dictionary]
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
795 '("Change Dictionary" . ispell-change-dictionary))
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
796 (define-key ispell-menu-map [ispell-kill-ispell]
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
797 '("Kill Process" . ispell-kill-ispell))
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
798 (define-key ispell-menu-map [ispell-pdict-save]
10697
d2fd1a6288b4 Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents: 10462
diff changeset
799 '("Save Dictionary" . (lambda () (interactive) (ispell-pdict-save t t))))
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
800 (define-key ispell-menu-map [ispell-complete-word]
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
801 '("Complete Word" . ispell-complete-word))
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
802 (define-key ispell-menu-map [ispell-complete-word-interior-frag]
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
803 '("Complete Word Frag" . ispell-complete-word-interior-frag))))
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
804
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
805 ;;;###autoload
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
806 (if ispell-menu-map-needed
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
807 (progn
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
808 (define-key ispell-menu-map [ispell-continue]
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
809 '("Continue Check" . ispell-continue))
8822
33a3f424c8c3 (ispell-menu-map): Order menu items by size: buffer > region > word.
Karl Heuer <kwzh@gnu.org>
parents: 8803
diff changeset
810 (define-key ispell-menu-map [ispell-word]
33a3f424c8c3 (ispell-menu-map): Order menu items by size: buffer > region > word.
Karl Heuer <kwzh@gnu.org>
parents: 8803
diff changeset
811 '("Check Word" . ispell-word))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
812 (define-key ispell-menu-map [ispell-comments-and-strings]
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
813 '("Check Comments" . ispell-comments-and-strings))
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
814 (define-key ispell-menu-map [ispell-region]
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
815 '("Check Region" . ispell-region))
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
816 (define-key ispell-menu-map [ispell-buffer]
8725
e4e6dc1e1be8 Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 8676
diff changeset
817 '("Check Buffer" . ispell-buffer))))
e4e6dc1e1be8 Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 8676
diff changeset
818
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
819 ;;;###autoload
8725
e4e6dc1e1be8 Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 8676
diff changeset
820 (if ispell-menu-map-needed
e4e6dc1e1be8 Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 8676
diff changeset
821 (progn
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
822 (define-key ispell-menu-map [ispell-message]
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
823 '("Check Message" . ispell-message))
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
824 (define-key ispell-menu-map [ispell-help]
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
825 ;; use (x-popup-menu last-nonmenu-event(list "" ispell-help-list)) ?
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
826 '("Help" . (lambda () (interactive) (describe-function 'ispell-help))))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
827 (put 'ispell-region 'menu-enable 'mark-active)
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
828 (fset 'ispell-menu-map (symbol-value 'ispell-menu-map))))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
829
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
830 ;;; XEmacs versions 19 & 20
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
831 (if (and ispell-xemacsp
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
832 (not ispell-version18p)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
833 (featurep 'menubar)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
834 (null ispell-menu-xemacs)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
835 (not (and (boundp 'infodock-version) infodock-version)))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
836 (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
837 (current-menubar (or current-menubar default-menubar))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
838 (menu
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
839 '(["Help" (describe-function 'ispell-help) t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
840 ;;["Help" (popup-menu ispell-help-list) t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
841 ["Check Message" ispell-message t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
842 ["Check Buffer" ispell-buffer t]
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
843 ["Check Comments" ispell-comments-and-strings t]
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
844 ["Check Word" ispell-word t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
845 ["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
846 ["Continue Check" ispell-continue t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
847 ["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
848 ["Complete Word" ispell-complete-word t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
849 ["Kill Process" ispell-kill-ispell t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
850 "-"
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
851 ["Save Personal Dict"(ispell-pdict-save t t) t]
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
852 ["Change Dictionary" ispell-change-dictionary t]
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
853 ["Select Default" (ispell-change-dictionary "default") t]))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
854 name load-dict)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
855 (while dicts
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
856 (setq name (car (car dicts))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
857 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
858 dicts (cdr dicts))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
859 ;; 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
860 (if (and (stringp name)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
861 (or (not ispell-library-path)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
862 (file-exists-p (concat ispell-library-path "/"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
863 name ".hash"))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
864 (file-exists-p (concat ispell-library-path "/"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
865 name ".has"))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
866 (and load-dict
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
867 (or (file-exists-p (concat ispell-library-path "/"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
868 load-dict ".hash"))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
869 (file-exists-p (concat ispell-library-path "/"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
870 load-dict ".has"))))))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
871 (setq menu (append menu
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
872 (list
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
873 (vector (concat "Select " (capitalize name))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
874 (list 'ispell-change-dictionary name)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
875 t))))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
876 (setq ispell-menu-xemacs menu)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
877 (if current-menubar
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
878 (progn
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
879 (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
880 (add-menu '("Edit") "Spell" ispell-menu-xemacs)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
881
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
882 ;;; Allow incrementing characters as integers in XEmacs 20
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
883 (if (and ispell-xemacsp
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
884 (fboundp 'int-char))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
885 (fset 'ispell-int-char 'int-char)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
886 ;; Emacs and XEmacs 19 or earlier
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
887 (fset 'ispell-int-char 'identity))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
888
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
889
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
890 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
891 ;;; The following are used by ispell, and should not be changed.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
892 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
893
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
894
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
895 ;;; 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
896 ;;; process is running. Otherwise it contains the global default.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
897 (defvar ispell-dictionary nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
898 "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
899 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
900 the dictionary for new buffers.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
901
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
902 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
903 used as key in `ispell-dictionary-alist' (which see).")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
904
19644
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
905 (defun ispell-decode-string (str)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
906 "Decodes multibyte character strings.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
907 Protects against bogus binding of `enable-multibyte-characters' in XEmacs."
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
908 (if (and (or ispell-xemacsp
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
909 (and (boundp 'enable-multibyte-characters)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
910 enable-multibyte-characters))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
911 (fboundp 'decode-coding-string)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
912 (ispell-get-coding-system))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
913 (decode-coding-string str (ispell-get-coding-system))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
914 str))
19644
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
915
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
916 (defun ispell-get-casechars ()
19644
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
917 (ispell-decode-string
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
918 (nth 1 (assoc ispell-dictionary ispell-dictionary-alist))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
919 (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
920 (ispell-decode-string
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
921 (nth 2 (assoc ispell-dictionary ispell-dictionary-alist))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
922 (defun ispell-get-otherchars ()
19644
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
923 (ispell-decode-string
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
924 (nth 3 (assoc ispell-dictionary ispell-dictionary-alist))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
925 (defun ispell-get-many-otherchars-p ()
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
926 (nth 4 (assoc ispell-dictionary ispell-dictionary-alist)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
927 (defun ispell-get-ispell-args ()
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
928 (nth 5 (assoc ispell-dictionary ispell-dictionary-alist)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
929 (defun ispell-get-extended-character-mode ()
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
930 (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
931 (defun ispell-get-coding-system ()
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
932 (nth 7 (assoc ispell-dictionary ispell-dictionary-alist)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
933
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
934 (defvar ispell-process nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
935 "The process object for Ispell.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
936
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
937 (defvar ispell-pdict-modified-p nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
938 "Non-nil means personal dictionary has modifications to be saved.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
939
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
940 ;;; 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
941 ;;; When non-nil, the spell session is terminated.
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
942 ;;; When numeric, contains cursor location in buffer, and cursor remains there.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
943 (defvar ispell-quit nil)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
944
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
945 (defvar ispell-filter nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
946 "Output filter from piped calls to Ispell.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
947
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
948 (defvar ispell-filter-continue nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
949 "Control variable for Ispell filter function.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
950
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
951 (defvar ispell-process-directory nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
952 "The directory where `ispell-process' was started.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
953
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
954 (defvar ispell-query-replace-marker (make-marker)
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
955 "Marker for `query-replace' processing.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
956
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
957 (defvar ispell-recursive-edit-marker (make-marker)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
958 "Marker for return point from recursive edit.")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
959
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
960 (defvar ispell-checking-message nil
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
961 "Non-nil when we're checking a mail message.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
962
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
963 (defconst ispell-choices-buffer "*Choices*")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
964
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
965 (defvar ispell-overlay nil "Overlay variable for Ispell highlighting.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
966
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
967 ;;; *** Buffer Local Definitions ***
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
968
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
969 (defconst ispell-words-keyword "LocalWords: "
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
970 "The keyword for local oddly-spelled words to accept.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
971 The keyword will be followed by any number of local word spellings.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
972 There can be multiple of these keywords in the file.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
973
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
974 (defconst ispell-dictionary-keyword "Local IspellDict: "
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
975 "The keyword for a local dictionary to use.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
976 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
977 `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
978 definition is used.")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
979
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
980 (defconst ispell-pdict-keyword "Local IspellPersDict: "
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
981 "The keyword for defining buffer local dictionaries.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
982 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
983 The last occurring definition in the buffer will be used.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
984
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
985 (defconst ispell-parsing-keyword "Local IspellParsing: "
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
986 "The keyword for overriding default Ispell parsing.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
987 The above keyword string should be followed by `latex-mode' or
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
988 `nroff-mode' to put the current buffer into the desired parsing mode.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
989
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
990 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
991 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
992 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
993
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
994 ;;;###autoload
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
995 (defvar ispell-skip-region-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
996 '((ispell-words-keyword forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
997 (ispell-dictionary-keyword forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
998 (ispell-pdict-keyword forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
999 (ispell-parsing-keyword forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1000 ("^---*BEGIN PGP [A-Z ]*--*" . "^---*END PGP [A-Z ]*--*")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1001 ("^---* \\(Start of \\)?[Ff]orwarded [Mm]essage" . "^---* End of [Ff]orwarded [Mm]essage")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1002 ;; matches e-mail addresses, file names, http addresses, etc.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1003 ("\\(/\\|\\(\\(\\w\\|-\\)+[.:@]\\)\\)\\(\\w\\|-\\)*\\([.:/@]+\\(\\w\\|-\\|~\\)+\\)+")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1004 ;; This is a pretty complex regexp. It can be simplified to the following:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1005 ;; "\\(\\w\\|-\\)*\\([.:/@]+\\(\\w\\|-\\|~\\)+\\)+"
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
1006 ;; 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
1007 ;; 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
1008 ;; 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
1009 ;; identification of the computer name, e.g.:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1010 ;; "\\(\\w\\|-\\)+[.:@]\\(\\w\\|-\\)*\\([.:/@]+\\(\\w\\|-\\|~\\)+\\)+"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1011 )
22529
d9eac134a41b Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22526
diff changeset
1012 "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
1013 The alist key must be a regular expression.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1014 Valid forms include:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1015 (KEY) - just skip the key.
22529
d9eac134a41b Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22526
diff changeset
1016 (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
1017 (KEY REGEXP) - skip to end of REGEXP. REGEXP must be a string.
22529
d9eac134a41b Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22526
diff changeset
1018 (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
1019
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1020
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1021
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1022 ;;;###autoload
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1023 (defvar ispell-tex-skip-alists
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
1024 '((;;("%\\[" . "%\\]") ; AMStex block comment...
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1025 ;; 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
1026 ;; \cite, \hspace, \hspace*, \hyphenation, \include, \includeonly, \input,
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1027 ;; \label, \nocite, \rule (in ispell - rest included here)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1028 ("\\\\addcontentsline" ispell-tex-arg-end 2)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1029 ("\\\\add\\(tocontents\\|vspace\\)" ispell-tex-arg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1030 ("\\\\\\([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
1031 ;;("\\\\author" ispell-tex-arg-end)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1032 ("\\\\bibliographystyle" ispell-tex-arg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1033 ("\\\\makebox" ispell-tex-arg-end 0)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1034 ;;("\\\\epsfig" ispell-tex-arg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1035 ("\\\\document\\(class\\|style\\)" .
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1036 "\\\\begin[ \t\n]*{[ \t\n]*document[ \t\n]*}"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1037 (;; delimited with \begin. In ispell: displaymath, eqnarray, eqnarray*,
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1038 ;; equation, minipage, picture, tabular, tabular* (ispell)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1039 ("\\(figure\\|table\\)\\*?" ispell-tex-arg-end 0)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1040 ("list" ispell-tex-arg-end 2)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1041 ("program" . "\\\\end[ \t\n]*{[ \t\n]*program[ \t\n]*}")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1042 ("verbatim\\*?" . "\\\\end[ \t\n]*{[ \t\n]*verbatim\\*?[ \t\n]*}")))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1043 "*Lists of regions to be skipped in TeX mode.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1044 First list is used raw.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1045 Second list has key placed inside \\begin{}.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1046
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1047 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
1048 for skipping in latex mode.")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1049
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1050
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1051 (defcustom ispell-skip-sgml 'use-mode-name
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1052 "*Indicates whether ispell should skip spell checking of SGML markup.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1053 If t, always skip SGML markup; if nil, never skip; if non-t and non-nil,
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1054 guess whether SGML markup should be skipped according to the name of the
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1055 buffer's major mode."
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1056 :type '(choice (const :tag "always" t) (const :tag "never" nil)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1057 (const :tag "use-mode-name" use-mode-name))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1058 :group 'ispell)
10697
d2fd1a6288b4 Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents: 10462
diff changeset
1059
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1060 (defvar ispell-local-pdict ispell-personal-dictionary
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1061 "A buffer local variable containing the current personal dictionary.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1062 If non-nil, the value must be a string, which is a file name.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1063
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1064 If you specify a personal dictionary for the current buffer which is
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1065 different from the current personal dictionary, the effect is similar
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1066 to calling \\[ispell-change-dictionary]. This variable is automatically
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1067 set when defined in the file with either `ispell-pdict-keyword' or the
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1068 local variable syntax.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1069
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1070 (make-variable-buffer-local 'ispell-local-pdict)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1071
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1072 (defvar ispell-buffer-local-name nil
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1073 "Contains the buffer name if local word definitions were used.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1074 Ispell is then restarted because the local words could conflict.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1075
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1076 (defvar ispell-parser 'use-mode-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1077 "*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
1078 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
1079 Default parser is `nroff'.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1080 Currently the only other valid parser is `tex'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1081
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1082 You can set this variable in hooks in your init file -- eg:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1083
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1084 (add-hook 'tex-mode-hook (function (lambda () (setq ispell-parser 'tex))))")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1085
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1086 (defvar ispell-region-end (make-marker)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1087 "Marker that allows spelling continuations.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1088
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
1089 (defvar ispell-check-only nil
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
1090 "If non-nil, `ispell-word' does not try to correct the word.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1091
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1092
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1093 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1094 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1095
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1096
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1097
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1098 (and (not ispell-version18p)
10697
d2fd1a6288b4 Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents: 10462
diff changeset
1099 (not (boundp 'epoch::version))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1100 (defalias 'ispell 'ispell-buffer)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1101 (defalias 'ispell-check-version 'check-ispell-version))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1102
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1103
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1104 (if (not (fboundp 'buffer-substring-no-properties))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1105 (defun buffer-substring-no-properties (start end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1106 (buffer-substring start end)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1107
12260
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
1108 ;;;###autoload
21989
d6cca4865f58 (ispell-word): Make M-$ binding using esc-map.
Richard M. Stallman <rms@gnu.org>
parents: 21873
diff changeset
1109 (define-key esc-map "$" 'ispell-word)
6839
7cd9ecd593d7 Bind M-$.
Richard M. Stallman <rms@gnu.org>
parents: 6646
diff changeset
1110
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1111 ;;;###autoload
7585
64976da3fb8a (ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents: 7014
diff changeset
1112 (defun ispell-word (&optional following quietly continue)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1113 "Check spelling of word under or before the cursor.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1114 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
1115 in a window allowing you to choose one.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1116
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1117 If optional argument FOLLOWING is non-nil or if `ispell-following-word'
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1118 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
1119 \(rather than preceding\) is checked when the cursor is not over a word.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1120 When the optional argument QUIETLY is non-nil or `ispell-quietly' is non-nil
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1121 when called interactively, non-corrective messages are suppressed.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1122
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1123 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
1124 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
1125
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1126 Word syntax described by `ispell-dictionary-alist' (which see).
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1127
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1128 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
1129 or \\[ispell-region] to update the Ispell process.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1130
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1131 return values:
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1132 nil word is correct or spelling is accpeted.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1133 0 word is inserted into buffer-local definitions.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1134 \"word\" word corrected from word list.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1135 \(\"word\" arg\) word is hand entered.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1136 quit spell session exited."
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1137
7585
64976da3fb8a (ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents: 7014
diff changeset
1138 (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
1139 (if continue
64976da3fb8a (ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents: 7014
diff changeset
1140 (ispell-continue)
64976da3fb8a (ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents: 7014
diff changeset
1141 (if (interactive-p)
64976da3fb8a (ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents: 7014
diff changeset
1142 (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
1143 quietly ispell-quietly))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1144 (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
1145 (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
1146 (word (ispell-get-word following))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1147 start end poss new-word replace)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1148 ;; De-structure return word info list.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1149 (setq start (car (cdr word))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1150 end (car (cdr (cdr word)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1151 word (car word))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1152
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1153 ;; 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
1154 (cond
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
1155 ((> (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
1156 (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
1157 (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
1158 (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
1159 (process-send-string ispell-process "%\n") ;put in verbose mode
47b8415a9976 (ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents: 21591
diff changeset
1160 (process-send-string ispell-process (concat "^" word "\n"))
47b8415a9976 (ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents: 21591
diff changeset
1161 ;; 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
1162 (while (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
1163 (accept-process-output 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
1164 (not (string= "" (car ispell-filter)))))
47b8415a9976 (ispell-get-word): No error if can't find a word to check.
Richard M. Stallman <rms@gnu.org>
parents: 21591
diff changeset
1165 ;;(process-send-string ispell-process "!\n") ;back to terse mode.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1166 (setq ispell-filter (cdr ispell-filter)) ; remove extra \n
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1167 (if (and ispell-filter (listp ispell-filter))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1168 (if (> (length ispell-filter) 1)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1169 (error "Ispell and its process have different character maps.")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1170 (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
1171 (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
1172 (or quietly
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1173 (message "%s is correct"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1174 (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
1175 ((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
1176 (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
1177 (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
1178 (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
1179 (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
1180 ((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
1181 (ispell-check-only ; called from ispell minor mode.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1182 (beep)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1183 (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
1184 (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
1185 (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
1186 (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
1187 (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
1188 (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
1189 (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
1190 (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
1191 (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
1192 (replace
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1193 (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
1194 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
1195 cursor-location))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1196 (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
1197 (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
1198 (delete-region start end)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1199 (setq start (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1200 (insert new-word)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1201 (setq end (point))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1202 (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
1203 (progn
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1204 (if (car (cdr replace)) ; query replace requested
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1205 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1206 (query-replace word new-word t)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1207 (goto-char start)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1208 ;; single word could be split into multiple words
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1209 (setq ispell-quit (not (ispell-region start end)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1210 ))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1211 ;; 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
1212 (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
1213 (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
1214 (ispell-pdict-save ispell-silently-savep)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1215 ;; NB: Cancels ispell-quit incorrectly if called from ispell-region
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1216 (if ispell-quit (setq ispell-quit nil replace 'quit))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1217 (goto-char cursor-location) ; return to original location
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1218 replace)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1219
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1220
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1221 (defun ispell-get-word (following &optional extra-otherchars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1222 "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
1223 If optional argument FOLLOWING is non-nil or if `ispell-following-word'
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1224 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
1225 \(rather than preceding\) is checked when the cursor is not over a word.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1226 Optional second argument contains otherchars that can be included in word
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1227 many times.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1228
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1229 Word syntax described by `ispell-dictionary-alist' (which see)."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1230 (let* ((ispell-casechars (ispell-get-casechars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1231 (ispell-not-casechars (ispell-get-not-casechars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1232 (ispell-otherchars (ispell-get-otherchars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1233 (ispell-many-otherchars-p (ispell-get-many-otherchars-p))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1234 (word-regexp (concat ispell-casechars
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1235 "+\\("
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1236 (if (not (string= "" ispell-otherchars))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1237 (concat ispell-otherchars "?"))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1238 (if extra-otherchars
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1239 (concat extra-otherchars "?"))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1240 ispell-casechars
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1241 "+\\)"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1242 (if (or ispell-many-otherchars-p
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1243 extra-otherchars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1244 "*" "?")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1245 did-it-once prevpt
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1246 start end word)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1247 ;; find the word
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1248 (if (not (looking-at ispell-casechars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1249 (if following
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1250 (re-search-forward ispell-casechars (point-max) t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1251 (re-search-backward ispell-casechars (point-min) t)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1252 ;; move to front of word
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1253 (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
1254 (while (and (or (and (not (string= "" ispell-otherchars))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1255 (looking-at ispell-otherchars))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1256 (and extra-otherchars (looking-at extra-otherchars)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1257 (not (bobp))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1258 (or (not did-it-once)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1259 ispell-many-otherchars-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1260 (not (eq prevpt (point))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1261 (if (and extra-otherchars (looking-at extra-otherchars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1262 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1263 (backward-char 1)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1264 (if (looking-at ispell-casechars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1265 (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
1266 (setq did-it-once t
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1267 prevpt (point))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1268 (backward-char 1)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1269 (if (looking-at ispell-casechars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1270 (re-search-backward ispell-not-casechars (point-min) 'move)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1271 (backward-char -1))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1272 ;; 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
1273 (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
1274 (if ispell-check-only
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1275 ;; 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
1276 (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
1277 (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
1278 (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
1279 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
1280 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
1281 (list word start end))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1282
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1283
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1284 ;;; Global ispell-pdict-modified-p is set by ispell-command-loop and
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1285 ;;; tracks changes in the dictionary. The global may either be
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1286 ;;; a value or a list, whose value is the state of whether the
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1287 ;;; dictionary needs to be saved.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1288
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1289 ;;; ###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1290 (defun ispell-pdict-save (&optional no-query force-save)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1291 "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
1292 If so, ask if it needs to be saved."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1293 (interactive (list ispell-silently-savep t))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1294 (if (and ispell-pdict-modified-p (listp ispell-pdict-modified-p))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1295 (setq ispell-pdict-modified-p (car ispell-pdict-modified-p)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1296 (if (or ispell-pdict-modified-p force-save)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1297 (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
1298 (progn
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
1299 (process-send-string ispell-process "#\n") ; save dictionary
10697
d2fd1a6288b4 Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents: 10462
diff changeset
1300 (message "Personal dictionary saved."))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1301 ;; unassert variable, even if not saved to avoid questioning.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1302 (setq ispell-pdict-modified-p nil))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1303
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1304
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1305 (defun ispell-command-loop (miss guess word start end)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1306 "Display possible corrections from list MISS.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1307 GUESS lists possibly valid affix construction of WORD.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1308 Returns nil to keep word.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1309 Returns 0 to insert locally into buffer-local dictionary.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1310 Returns string for new chosen word.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1311 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
1312 Query-replace when list length is 2.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1313 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
1314 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
1315 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
1316 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
1317 used.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1318 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
1319 (let ((count ?0)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1320 (line ispell-choices-win-default-height)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1321 (max-lines (- (window-height) 4)) ; ensure 4 context lines.
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1322 (choices miss)
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1323 (window-min-height (min window-min-height
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1324 ispell-choices-win-default-height))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1325 (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
1326 (dedicated (window-dedicated-p (selected-window)))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1327 (skipped 0)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1328 char num result textwin dedicated-win)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1329
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1330 ;; setup the *Choices* buffer with valid data.
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1331 (save-excursion
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1332 (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
1333 (setq mode-line-format (concat "-- %b -- word: " word))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1334 ;; XEmacs: prevent thick modeline vs increasing height in overlay-window
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1335 ;;(and (fboundp 'set-specifier)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1336 ;; (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
1337 (erase-buffer)
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1338 (if guess
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1339 (progn
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1340 (insert "Affix rules generate and capitalize "
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1341 "this word as shown below:\n\t")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1342 (while guess
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1343 (if (> (+ 4 (current-column) (length (car guess)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1344 (window-width))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1345 (progn
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1346 (insert "\n\t")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1347 (setq line (1+ line))))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1348 (insert (car guess) " ")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1349 (setq guess (cdr guess)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1350 (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
1351 " from the derivative root.\n")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1352 (setq line (+ line (if choices 3 2)))))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1353 (while (and choices
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1354 (< (if (> (+ 7 (current-column) (length (car choices))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1355 (if (> count ?~) 3 0))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1356 (window-width))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1357 (progn
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1358 (insert "\n")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1359 (setq line (1+ line)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1360 line)
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1361 max-lines))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1362 ;; 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
1363 ;; 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
1364 (while (memq count command-characters) ; skip command characters.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1365 (setq count (ispell-int-char (1+ count))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1366 skipped (1+ skipped)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1367 (insert "(" count ") " (car choices) " ")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1368 (setq choices (cdr choices)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1369 count (ispell-int-char (1+ count))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1370 (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
1371
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1372 ;; Assure word is visible
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1373 (if (not (pos-visible-in-window-p end))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1374 (sit-for 0))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1375
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1376 ;; allow temporary split of dedicated windows...
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1377 (if dedicated
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1378 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1379 (setq dedicated-win (selected-window))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1380 (set-window-dedicated-p dedicated-win nil)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1381
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1382 ;; Display choices for misspelled word.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1383 (ispell-show-choices line end)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1384 (select-window (setq textwin (next-window)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1385
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1386 ;; highlight word, protecting current buffer status
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1387 (unwind-protect
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1388 (progn
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1389 (and ispell-highlight-p
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1390 (ispell-highlight-spelling-error start end t))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1391 ;; Loop until a valid choice is made.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1392 (while
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1393 (eq
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1394 t
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1395 (setq
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1396 result
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1397 (progn
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1398 (undo-boundary)
17143
df636f296adf (ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents: 16762
diff changeset
1399 (let (message-log-max)
df636f296adf (ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents: 16762
diff changeset
1400 (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
1401 "unchanged, Character to replace word")))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1402 (let ((inhibit-quit t))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1403 (setq char (if (fboundp 'read-char-exclusive)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1404 (read-char-exclusive)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1405 (read-char))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1406 skipped 0)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1407 (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
1408 (setq char ?X
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1409 quit-flag nil)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1410 ;; Adjust num to array offset skipping command characters.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1411 (let ((com-chars command-characters))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1412 (while com-chars
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1413 (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
1414 (setq skipped (1+ skipped)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1415 (setq com-chars (cdr com-chars)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1416 (setq num (- char ?0 skipped)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1417
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1418 (cond
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1419 ((= char ? ) nil) ; accept word this time only
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1420 ((= char ?i) ; accept and insert word into pers dict
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1421 (process-send-string ispell-process (concat "*" word "\n"))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1422 (setq ispell-pdict-modified-p '(t)) ; dictionary modified!
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1423 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1424 ((or (= char ?a) (= char ?A)) ; accept word without insert
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1425 (process-send-string ispell-process (concat "@" word "\n"))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1426 (if (null ispell-pdict-modified-p)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1427 (setq ispell-pdict-modified-p
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1428 (list ispell-pdict-modified-p)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1429 (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
1430 ((or (= char ?r) (= char ?R)) ; type in replacement
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1431 (and (eq 'block ispell-highlight-p) ; refresh tty's
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1432 (ispell-highlight-spelling-error start end nil t))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1433 (let ((result
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1434 (if (or (= char ?R) ispell-query-replace-choices)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1435 (list (read-string
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1436 (format "Query-replacement for %s: "word)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1437 word)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1438 t)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1439 (cons (read-string "Replacement for: " word)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1440 nil))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1441 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1442 (ispell-highlight-spelling-error start end nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1443 'block))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1444 result))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1445 ((or (= char ??) (= char help-char) (= char ?\C-h))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1446 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1447 (ispell-highlight-spelling-error start end nil t))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1448 (ispell-help)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1449 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1450 (ispell-highlight-spelling-error start end nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1451 'block))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1452 t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1453 ;; Quit and move point back.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1454 ((= char ?x)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1455 (ispell-pdict-save ispell-silently-savep)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1456 (message "Exited spell-checking")
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1457 (setq ispell-quit t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1458 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1459 ;; Quit and preserve point.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1460 ((= char ?X)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1461 (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
1462 (message "%s"
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1463 (substitute-command-keys
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1464 (concat "Spell-checking suspended;"
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1465 " use C-u \\[ispell-word] to resume")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1466 (setq ispell-quit start)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1467 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1468 ((= char ?q)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1469 (if (y-or-n-p "Really kill Ispell process? ")
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1470 (progn
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1471 (ispell-kill-ispell t) ; terminate process.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1472 (setq ispell-quit (or (not ispell-checking-message)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1473 (point))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1474 ispell-pdict-modified-p nil))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1475 t)) ; continue if they don't quit.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1476 ((= char ?l)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1477 (and (eq 'block ispell-highlight-p) ; refresh tty displays
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1478 (ispell-highlight-spelling-error start end nil t))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1479 (let ((new-word (read-string
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1480 "Lookup string (`*' is wildcard): "
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1481 word)))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1482 (if new-word
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1483 (progn
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1484 (save-excursion
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1485 (set-buffer (get-buffer-create
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1486 ispell-choices-buffer))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1487 (erase-buffer)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1488 (setq count ?0
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1489 skipped 0
12260
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
1490 mode-line-format (concat
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
1491 "-- %b -- word: "
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
1492 new-word)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1493 miss (lookup-words new-word)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1494 choices miss
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1495 line ispell-choices-win-default-height)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1496 (while (and choices ; adjust choices window.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1497 (< (if (> (+ 7 (current-column)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1498 (length (car choices))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1499 (if (> count ?~) 3 0))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1500 (window-width))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1501 (progn
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1502 (insert "\n")
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1503 (setq line (1+ line)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1504 line)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1505 max-lines))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1506 (while (memq count command-characters)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1507 (setq count (ispell-int-char (1+ count))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1508 skipped (1+ skipped)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1509 (insert "(" count ") " (car choices) " ")
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1510 (setq choices (cdr choices)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1511 count (ispell-int-char (1+ count))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1512 (setq count (ispell-int-char
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1513 (- count ?0 skipped))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1514 (ispell-show-choices line end)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1515 (select-window (next-window)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1516 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1517 (ispell-highlight-spelling-error start end nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1518 'block))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1519 t) ; reselect from new choices
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
1520 ((= char ?u) ; insert lowercase into dictionary
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1521 (process-send-string ispell-process
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1522 (concat "*" (downcase word) "\n"))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1523 (setq ispell-pdict-modified-p '(t)) ; dictionary modified!
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1524 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1525 ((= char ?m) ; type in what to insert
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1526 (process-send-string
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1527 ispell-process (concat "*" (read-string "Insert: " word)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1528 "\n"))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1529 (setq ispell-pdict-modified-p '(t))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1530 (cons word nil))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1531 ((and (>= num 0) (< num count))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1532 (if ispell-query-replace-choices ; Query replace flag
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1533 (list (nth num miss) 'query-replace)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1534 (nth num miss)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1535 ((= char ?\C-l)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1536 (redraw-display) t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1537 ((= char ?\C-r)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1538 ;; 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
1539 (if (marker-position ispell-recursive-edit-marker)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1540 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1541 (message "Only one recursive edit session supported")
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1542 (beep)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1543 (sit-for 2))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1544 (set-marker ispell-recursive-edit-marker start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1545 ;;(set-marker ispell-region-end reg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1546 (and ispell-highlight-p ; unhighlight
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1547 (ispell-highlight-spelling-error start end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1548 (unwind-protect
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1549 (progn
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1550 (message
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1551 "%s"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1552 (substitute-command-keys
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1553 (concat "Exit recursive edit with"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1554 " \\[exit-recursive-edit]")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1555 (save-window-excursion (save-excursion
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1556 (recursive-edit))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1557 ;; protected
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1558 (goto-char ispell-recursive-edit-marker)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1559 (if (not (equal (marker-buffer
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1560 ispell-recursive-edit-marker)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1561 (current-buffer)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1562 (progn
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1563 (set-marker ispell-recursive-edit-marker nil)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1564 (error
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1565 "Cannot continue ispell from this buffer.")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1566 (set-marker ispell-recursive-edit-marker nil)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1567 (list word nil)) ; recheck starting at this word.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1568 ((= char ?\C-z)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1569 (funcall (key-binding "\C-z"))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1570 t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1571 (t (ding) t))))))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1572 result)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1573 ;; protected
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1574 (and ispell-highlight-p ; unhighlight
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1575 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1576 (select-window textwin)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1577 (ispell-highlight-spelling-error start end)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1578 (if dedicated
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1579 (set-window-dedicated-p dedicated-win t)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1580
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1581
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1582
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1583 (defun ispell-show-choices (line end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1584 "Shows the choices in another buffer or frame."
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1585 (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
1586 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1587 (framepop-display-buffer (get-buffer ispell-choices-buffer))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1588 (get-buffer-window ispell-choices-buffer t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1589 (select-window (previous-window))) ; *Choices* window
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1590 ;; 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
1591 (let ((choices-window (get-buffer-window ispell-choices-buffer)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1592 (if choices-window
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1593 (if (= line (window-height choices-window))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1594 (select-window choices-window)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1595 ;; *Choices* window changed size. Adjust the choices window
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1596 ;; without scrolling the spelled window when possible
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1597 (let ((window-line (- line (window-height choices-window)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1598 (visible (progn (vertical-motion -1) (point))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1599 (if (< line ispell-choices-win-default-height)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1600 (setq window-line (+ window-line
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1601 (- ispell-choices-win-default-height
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1602 line))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1603 (move-to-window-line 0)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1604 (vertical-motion window-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1605 (set-window-start (selected-window)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1606 (if (> (point) visible) visible (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1607 (goto-char end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1608 (select-window (previous-window)) ; *Choices* window
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1609 (enlarge-window window-line)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1610 ;; Overlay *Choices* window when it isn't showing
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1611 (ispell-overlay-window (max line ispell-choices-win-default-height)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1612 (switch-to-buffer ispell-choices-buffer)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1613 (goto-char (point-min)))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1614
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1615
6288
3197bf3cc0a1 (ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents: 6285
diff changeset
1616 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1617 (defun ispell-help ()
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
1618 "Display a list of the options available when a misspelling is encountered.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1619
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1620 Selections are:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1621
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1622 DIGIT: Replace the word with a digit offered in the *Choices* buffer.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1623 SPC: Accept word this time.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1624 `i': Accept word and insert into private dictionary.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1625 `a': Accept word for this session.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1626 `A': Accept word and place in `buffer-local dictionary'.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1627 `r': Replace word with typed-in value. Rechecked.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1628 `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1629 `?': Show these commands.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1630 `x': Exit spelling buffer. Move cursor to original point.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1631 `X': Exit spelling buffer. Leaves cursor at the current point, and permits
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1632 the aborted check to be completed later.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1633 `q': Quit spelling session (Kills ispell process).
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1634 `l': Look up typed-in replacement in alternate dictionary. Wildcards okay.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1635 `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
1636 `m': Place typed-in value in personal dictionary, then recheck current word.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1637 `C-l': redraws screen
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1638 `C-r': recursive edit
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1639 `C-z': suspend emacs or iconify frame"
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1640
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1641 (if (equal ispell-help-in-bufferp 'electric)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1642 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1643 (require 'ehelp)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1644 (with-electric-help
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1645 (function (lambda ()
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1646 ;;This shouldn't be necessary: with-electric-help needs
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1647 ;; an optional argument telling it about the smallest
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1648 ;; acceptable window-height of the help buffer.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1649 (if (< (window-height) 15)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1650 (enlarge-window (- 15 (window-height))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1651 (princ "Selections are:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1652
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1653 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
1654 SPC: Accept word this time.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1655 `i': Accept word and insert into private dictionary.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1656 `a': Accept word for this session.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1657 `A': Accept word and place in `buffer-local dictionary'.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1658 `r': Replace word with typed-in value. Rechecked.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1659 `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
1660 `?': Show these commands.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1661 `x': Exit spelling buffer. Move cursor to original point.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1662 `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
1663 the aborted check to be completed later.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1664 `q': Quit spelling session (Kills ispell process).
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1665 `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
1666 `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
1667 `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
1668 `C-l': redraws screen
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1669 `C-r': recursive edit
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1670 `C-z': suspend emacs or iconify frame")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1671 nil ;undocumented requirement of with-electric-help
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1672 ))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1673
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1674
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1675 (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
1676 "[i]nsert into private dictionary"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1677 (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
1678 "e[x/X]it; [q]uit session"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1679 (help-3 (concat "[u]ncapitalized insert into dict. "
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1680 "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
1681 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1682 (if ispell-help-in-bufferp
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1683 (progn
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1684 (ispell-overlay-window (if ispell-xemacsp 5 4))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1685 (switch-to-buffer (get-buffer-create "*Ispell Help*"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1686 (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
1687 (sit-for 5)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1688 (kill-buffer "*Ispell Help*"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1689 (select-window (minibuffer-window))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1690 (erase-buffer)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1691 (if (not ispell-version18p) (message nil))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1692 ;;(set-minibuffer-window (selected-window))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1693 (enlarge-window 2)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1694 (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
1695 (sit-for 5)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1696 (erase-buffer))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1697
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1698
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1699 (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
1700 "Look up WORD in optional word-list dictionary LOOKUP-DICT.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1701 A `*' serves as a wild card. If no wild cards, `look' is used if it exists.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1702 Otherwise the variable `ispell-grep-command' contains the command used to
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1703 search for the words (usually egrep).
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1704
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
1705 Optional second argument contains the dictionary to use; the default is
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1706 `ispell-alternate-dictionary'."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1707 ;; We don't use the filter for this function, rather the result is written
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1708 ;; into a buffer. Hence there is no need to save the filter values.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1709 (if (null lookup-dict)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1710 (setq lookup-dict ispell-alternate-dictionary))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1711
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1712 (let* ((process-connection-type ispell-use-ptys-p)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1713 (wild-p (string-match "\\*" word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1714 (look-p (and ispell-look-p ; Only use look for an exact match.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1715 (or ispell-have-new-look (not wild-p))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1716 (ispell-grep-buffer (get-buffer-create "*Ispell-Temp*")) ; result buf
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1717 (prog (if look-p ispell-look-command ispell-grep-command))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1718 (args (if look-p ispell-look-options ispell-grep-options))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1719 status results loc)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1720 (unwind-protect
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1721 (save-window-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1722 (message "Starting \"%s\" process..." (file-name-nondirectory prog))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1723 (set-buffer ispell-grep-buffer)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1724 (if look-p
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1725 nil
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1726 ;; convert * to .*
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1727 (insert "^" word "$")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1728 (while (search-backward "*" nil t) (insert "."))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1729 (setq word (buffer-string))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1730 (erase-buffer))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1731 (setq status (call-process prog nil t nil args word lookup-dict))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1732 ;; grep returns status 1 and no output when word not found, which
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1733 ;; is a perfectly normal thing.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1734 (if (stringp status)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1735 (setq results (cons (format "error: %s exited with signal %s"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1736 (file-name-nondirectory prog) status)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1737 results))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1738 ;; else collect words into `results' in FIFO order
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1739 (goto-char (point-max))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1740 ;; assure we've ended with \n
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1741 (or (bobp) (= (preceding-char) ?\n) (insert ?\n))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1742 (while (not (bobp))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1743 (setq loc (point))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1744 (forward-line -1)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1745 (setq results (cons (buffer-substring-no-properties (point)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1746 (1- loc))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1747 results)))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1748 ;; protected
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1749 (kill-buffer ispell-grep-buffer)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1750 (if (and results (string-match ".+: " (car results)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1751 (error "%s error: %s" ispell-grep-command (car results))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1752 results))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1753
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1754
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1755 ;;; "ispell-filter" is a list of output lines from the generating function.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1756 ;;; Each full line (ending with \n) is a separate item on the list.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1757 ;;; "output" can contain multiple lines, part of a line, or both.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1758 ;;; "start" and "end" are used to keep bounds on lines when "output" contains
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1759 ;;; multiple lines.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1760 ;;; "ispell-filter-continue" is true when we have received only part of a
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1761 ;;; line as output from a generating function ("output" did not end with \n)
14040
187735b53d52 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
1762 ;;; THIS FUNCTION WILL FAIL IF THE PROCESS OUTPUT DOESN'T END WITH \n!
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1763 ;;; This is the case when a process dies or fails. The default behavior
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1764 ;;; in this case treats the next input received as fresh input.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1765
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1766 (defun ispell-filter (process output)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1767 "Output filter function for ispell, grep, and look."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1768 (let ((start 0)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1769 (continue t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1770 end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1771 (while continue
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1772 (setq end (string-match "\n" output start)) ; get text up to the newline.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1773 ;; If we get out of sync and ispell-filter-continue is asserted when we
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1774 ;; are not continuing, treat the next item as a separate list. When
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1775 ;; ispell-filter-continue is asserted, ispell-filter *should* always be a
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1776 ;; list!
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1777
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1778 ;; Continue with same line (item)?
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1779 (if (and ispell-filter-continue ispell-filter (listp ispell-filter))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1780 ;; Yes. Add it to the prev item
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1781 (setcar ispell-filter
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1782 (concat (car ispell-filter) (substring output start end)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1783 ;; No. This is a new line and item.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1784 (setq ispell-filter
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1785 (cons (substring output start end) ispell-filter)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1786 (if (null end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1787 ;; We've completed reading the output, but didn't finish the line.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1788 (setq ispell-filter-continue t continue nil)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1789 ;; skip over newline, this line complete.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1790 (setq ispell-filter-continue nil end (1+ end))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1791 (if (= end (length output)) ; No more lines in output
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1792 (setq continue nil) ; so we can exit the filter.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1793 (setq start end)))))) ; else move start to next line of input
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1794
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1795
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1796 ;;; This function destroys the mark location if it is in the word being
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1797 ;;; highlighted.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1798 (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
1799 refresh)
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
1800 "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
1801 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
1802 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
1803 Uses block cursor to highlight one character.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1804 Optional REFRESH will unhighlighted then highlight, using block cursor
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1805 highlighting when REFRESH is equal to `block'."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1806 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1807 (or (eq 'block refresh)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1808 (setq start (1+ start)))) ; On block non-refresh, inc start.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1809 (let ((modified (buffer-modified-p)) ; don't allow this fn to modify buffer
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1810 (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
1811 (text (buffer-substring-no-properties start end)) ; Save hilight region
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1812 (inhibit-quit t) ; inhibit interrupt processing here.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1813 (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
1814 (goto-char end)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1815 (delete-region start end)
14040
187735b53d52 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
1816 (insert-char ? (- end start)) ; minimize amount of redisplay
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1817 (sit-for 0) ; update display
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1818 (if highlight (setq inverse-video (not inverse-video))) ; toggle video
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1819 (delete-region start end) ; delete whitespace
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1820 (insert text) ; insert text in inverse video.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1821 (sit-for 0) ; update display showing inverse video.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1822 (if (not highlight)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1823 (goto-char end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1824 (setq inverse-video (not inverse-video)) ; toggle video
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1825 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1826 (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
1827 (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
1828 (and refresh ; re-highlight
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1829 (ispell-highlight-spelling-error-generic
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1830 (if (eq 'block refresh) start (- start 2)) end t))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1831
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1832
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1833 (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
1834 "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
1835 When the optional third arg HIGHLIGHT is set, the word is highlighted,
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1836 otherwise it is displayed normally."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1837 (if highlight
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1838 (isearch-highlight start end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1839 (isearch-dehighlight t))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1840 ;;(sit-for 0)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1841 )
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1842
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1843
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1844 (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
1845 "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
1846 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
1847 otherwise it is displayed normally.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1848
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1849 The variable `ispell-highlight-face' selects the face to use for highlighting."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1850 (if highlight
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1851 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1852 (setq ispell-overlay (make-overlay start end))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1853 (overlay-put ispell-overlay 'face ispell-highlight-face))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1854 (delete-overlay ispell-overlay)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1855
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1856
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1857 (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
1858 (cond
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1859 (ispell-xemacsp
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1860 (ispell-highlight-spelling-error-xemacs start end highlight))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1861 ((and (not ispell-version18p)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1862 (featurep 'faces) window-system)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1863 (ispell-highlight-spelling-error-overlay start end highlight))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1864 (t (ispell-highlight-spelling-error-generic start end highlight refresh))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1865
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1866
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1867 (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
1868 "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
1869 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
1870 scrolling the current window. Leave the new window selected."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1871 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1872 (let ((oldot (save-excursion (forward-line -1) (point)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1873 (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
1874 ;; If line above old point (line starting at oldot) would be
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1875 ;; hidden by new window, scroll it to just below new win
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1876 ;; otherwise set top line of other win so it doesn't scroll.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1877 (if (< oldot top) (setq top oldot))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1878 ;; if frame is unsplitable, temporarily disable that...
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1879 (if (cdr (assq 'unsplittable (frame-parameters (selected-frame))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1880 (let ((frame (selected-frame)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1881 (modify-frame-parameters frame '((unsplittable . nil)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1882 (split-window nil height)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1883 (modify-frame-parameters frame '((unsplittable . t))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1884 (split-window nil height))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1885 (set-window-start (next-window) top))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1886
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1887
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1888 ;;; Should we add a compound word match return value?
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1889 (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
1890 "Parse the OUTPUT string from Ispell process and return:
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1891 1: t for an exact match.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1892 2: A string containing the root word matched via suffix removal.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1893 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
1894 (\"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
1895 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
1896 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
1897 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
1898 4: Nil when an error has occurred.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1899
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1900 Optinal second arg ACCEPT-LIST is list of words already accepted.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1901 Optional third arg SHIFT is an offset to apply based on previous corrections."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1902 (cond
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1903 ((string= output "") t) ; for startup with pipes...
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1904 ((string= output "*") t) ; exact match
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1905 ((string= output "-") t) ; compound word match
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1906 ((string= (substring output 0 1) "+") ; found because of root word
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1907 (substring output 2)) ; return root word
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1908 ((equal 0 (string-match "[\ra-zA-Z]" output))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1909 (ding) ; error message from ispell!
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1910 (message (concat "Ispell error: " output))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1911 (sit-for 5)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1912 nil)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1913 (t ; need to process &, ?, and #'s
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1914 (let ((type (substring output 0 1)) ; &, ?, or #
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1915 (original-word (substring output 2 (string-match " " output 2)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1916 (cur-count 0) ; contains number of misses + guesses
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1917 count miss-list guess-list offset)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1918 (setq output (substring output (match-end 0))) ; skip over misspelling
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1919 (if (string= type "#")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1920 (setq count 0) ; no misses for type #
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1921 (setq count (string-to-int output) ; get number of misses.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1922 output (substring output (1+ (string-match " " output 1)))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1923 (setq offset (string-to-int output))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1924 (if (string= type "#") ; No miss or guess list.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1925 (setq output nil)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1926 (setq output (substring output (1+ (string-match " " output 1)))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1927 (while output
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1928 (let ((end (string-match ", \\|\\($\\)" output))) ; end of miss/guess.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1929 (setq cur-count (1+ cur-count))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1930 (if (> cur-count count)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1931 (setq guess-list (cons (substring output 0 end) guess-list))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1932 (setq miss-list (cons (substring output 0 end) miss-list)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1933 (if (match-end 1) ; True only when at end of line.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1934 (setq output nil) ; no more misses or guesses
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1935 (setq output (substring output (+ end 2))))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1936 ;; return results. Accept word if it was already accepted.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1937 ;; adjust offset.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1938 (if (member original-word accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1939 t
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1940 (list original-word
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1941 (if (numberp shift) (+ shift offset) offset)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1942 (nreverse miss-list) (nreverse guess-list)))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1943
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1944
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1945 (defun ispell-init-process ()
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
1946 "Check status of Ispell process and start if necessary."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1947 (if (and ispell-process
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1948 (eq (process-status ispell-process) 'run)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1949 ;; If we're using a personal dictionary, assure
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1950 ;; we're in the same default directory!
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1951 (or (not ispell-personal-dictionary)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1952 (equal ispell-process-directory default-directory)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1953 (setq ispell-filter nil ispell-filter-continue nil)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1954 ;; may need to restart to select new personal dictionary.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1955 (ispell-kill-ispell t)
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
1956 (message "Starting new Ispell process...")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1957 (sit-for 0)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1958 (check-ispell-version)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1959 (setq ispell-process
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1960 (let ((process-connection-type ispell-use-ptys-p))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1961 (apply 'start-process
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1962 "ispell" nil ispell-program-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1963 "-a" ; accept single input lines
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1964 "-m" ; make root/affix combos not in dict
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1965 (let (args)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1966 ;; Local dictionary becomes the global dictionary in use.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1967 (if ispell-local-dictionary
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1968 (setq ispell-dictionary ispell-local-dictionary))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1969 (setq args (ispell-get-ispell-args))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1970 (if ispell-dictionary ; use specified dictionary
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1971 (setq args
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1972 (append (list "-d" ispell-dictionary) args)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1973 (if ispell-personal-dictionary ; use specified pers dict
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1974 (setq args
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1975 (append args
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1976 (list "-p"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1977 (expand-file-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1978 ispell-personal-dictionary)))))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1979 (setq args (append args ispell-extra-args))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1980 args)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1981 ispell-filter nil
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1982 ispell-filter-continue nil
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1983 ispell-process-directory default-directory)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1984 (set-process-filter ispell-process 'ispell-filter)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1985 ;; protect against bogus binding of `enable-multibyte-characters' in XEmacs
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1986 (if (and (or ispell-xemacsp
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1987 (and (boundp 'enable-multibyte-characters)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1988 enable-multibyte-characters))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1989 (fboundp 'set-process-coding-system))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1990 (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
1991 (ispell-get-coding-system)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1992 ;; Get version ID line
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1993 (if (not ispell-version18p)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1994 (accept-process-output ispell-process 3)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1995 (accept-process-output ispell-process))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1996 ;; get more output if filter empty?
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1997 (if (null ispell-filter) (accept-process-output ispell-process 3))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1998 (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
1999 (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
2000 ((and
11c4f543b742 (ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents: 11304
diff changeset
2001 (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
2002 (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
2003 (progn
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2004 (if (not ispell-version18p)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2005 (accept-process-output ispell-process 3) ; was warn msg.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2006 (accept-process-output ispell-process))
11469
11c4f543b742 (ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents: 11304
diff changeset
2007 (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
2008 (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
2009 (string-match "^@(#) " (car ispell-filter)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2010 ;; got the version line as expected (we already know it's the right
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2011 ;; version, so don't bother checking again.)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2012 nil)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2013 (t
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2014 ;; Otherwise, it must be an error message. Show the user.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2015 ;; But first wait to see if some more output is going to arrive.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2016 ;; Otherwise we get cool errors like "Can't open ".
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2017 (sleep-for 1)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2018 (accept-process-output ispell-process 3)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2019 (error "%s" (mapconcat 'identity ispell-filter "\n"))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2020 (setq ispell-filter nil) ; Discard version ID line
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2021 (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
2022 (if extended-char-mode ; ~ extended character mode
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2023 (process-send-string ispell-process
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2024 (concat extended-char-mode "\n"))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2025 (process-kill-without-query ispell-process)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2026
6288
3197bf3cc0a1 (ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents: 6285
diff changeset
2027 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2028 (defun ispell-kill-ispell (&optional no-error)
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2029 "Kill current Ispell process (so that you may start a fresh one).
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2030 With NO-ERROR, just return non-nil if there was no Ispell running."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2031 (interactive)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2032 (if (not (and ispell-process
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2033 (eq (process-status ispell-process) 'run)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2034 (or no-error
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2035 (error "There is no ispell process running!"))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2036 (process-send-eof ispell-process)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2037 (if (eq (process-status ispell-process) 'run)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2038 (accept-process-output ispell-process 1))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2039 (if (eq (process-status ispell-process) 'run)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2040 (kill-process ispell-process))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2041 (while (not (or (eq (process-status ispell-process) 'exit)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2042 (eq (process-status ispell-process) 'signal)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2043 (if ispell-version20p (sleep-for 0.25)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2044 (sleep-for 0 250)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2045 (setq ispell-process nil)
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2046 (message "Ispell process killed")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2047 nil))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2048
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2049
12260
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
2050 ;;; 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
2051 ;;; 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
2052
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2053 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2054 (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
2055 "Change `ispell-dictionary' (q.v.) to DICT and kill old Ispell process.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2056 A new one will be started as soon as necessary.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2057
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2058 By just answering RET you can find out what the current dictionary is.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2059
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2060 With prefix argument, set the default directory."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2061 (interactive
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2062 (list (completing-read
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2063 "Use new dictionary (RET for current, SPC to complete): "
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2064 (cons (cons "default" nil) ispell-dictionary-alist) nil t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2065 current-prefix-arg))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2066 (if (equal dict "default") (setq dict nil))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2067 ;; This relies on completing-read's bug of returning "" for no match
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2068 (cond ((equal dict "")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2069 (message "Using %s dictionary"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2070 (or ispell-local-dictionary ispell-dictionary "default")))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2071 ((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
2072 (or (null ispell-local-dictionary)
d2fd1a6288b4 Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents: 10462
diff changeset
2073 (equal dict ispell-local-dictionary)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2074 ;; 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
2075 (and (interactive-p)
d2fd1a6288b4 Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents: 10462
diff changeset
2076 (message "No change, using %s dictionary" (or dict "default"))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2077 (t ; reset dictionary!
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2078 (if (assoc dict ispell-dictionary-alist)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2079 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2080 (if (or arg (null dict)) ; set default dictionary
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2081 (setq ispell-dictionary dict))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2082 (if (null arg) ; set local dictionary
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2083 (setq ispell-local-dictionary dict)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2084 (error "Undefined dictionary: %s" dict))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2085 (ispell-kill-ispell t)
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2086 (message "(Next %sIspell command will use %s dictionary)"
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2087 (cond ((equal ispell-local-dictionary ispell-dictionary)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2088 "")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2089 (arg "global ")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2090 (t "local "))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2091 (or (if (or (equal ispell-local-dictionary ispell-dictionary)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2092 (null arg))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2093 ispell-local-dictionary
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2094 ispell-dictionary)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2095 "default")))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2096
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2097
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2098 ;;; Spelling of comments are checked when ispell-check-comments is non-nil.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2099
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2100 ;;;###autoload
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2101 (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
2102 "Interactively check a region for spelling errors.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2103 Return nil if spell session is quit,
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2104 otherwise returns shift offset amount for last line processed."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2105 (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
2106 (if (not recheckp)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2107 (ispell-accept-buffer-local-defs)) ; set up dictionary, local words, etc.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2108 (unwind-protect
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2109 (save-excursion
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2110 (message "Spell checking %s using %s dictionary..."
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2111 (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
2112 (buffer-name) "region")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2113 (or ispell-dictionary "default"))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2114 ;; Returns cursor to original location.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2115 (save-window-excursion
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2116 (goto-char reg-start)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2117 (let ((transient-mark-mode)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2118 (case-fold-search case-fold-search)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2119 (skip-region-start (make-marker))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2120 (skip-regexp (ispell-begin-skip-region-regexp))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2121 (skip-alist ispell-skip-region-alist)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2122 key)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2123 (if (eq ispell-parser 'tex)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2124 (setq case-fold-search nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2125 skip-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2126 (append (car ispell-tex-skip-alists)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2127 (car (cdr ispell-tex-skip-alists))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2128 skip-alist)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2129 (let (message-log-max)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2130 (message "searching for regions to skip"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2131 (if (re-search-forward skip-regexp reg-end t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2132 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2133 (setq key (buffer-substring-no-properties
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2134 (match-beginning 0) (match-end 0)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2135 (set-marker skip-region-start (- (point) (length key)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2136 (goto-char reg-start)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2137 (let (message-log-max)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2138 (message "Continuing spelling check using %s dictionary..."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2139 (or ispell-dictionary "default")))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2140 (set-marker ispell-region-end reg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2141 (while (and (not ispell-quit)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2142 (< (point) ispell-region-end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2143 ;; spell-check region with skipping
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2144 (if (and (marker-position skip-region-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2145 (<= skip-region-start (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2146 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2147 (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
2148 (setq reg-start (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2149 (if (and (< reg-start ispell-region-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2150 (re-search-forward skip-regexp
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2151 ispell-region-end t))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2152 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2153 (setq key (buffer-substring-no-properties
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2154 (car (match-data))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2155 (car (cdr (match-data)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2156 (set-marker skip-region-start
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2157 (- (point) (length key)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2158 (goto-char reg-start))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2159 (set-marker skip-region-start nil))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2160 (setq reg-end (if (marker-position skip-region-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2161 (min skip-region-start ispell-region-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2162 (marker-position ispell-region-end)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2163 (let* ((start (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2164 (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
2165 (string (ispell-get-line start end reg-end)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2166 (setq end (point)) ; "end" tracks region retrieved.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2167 (if string ; there is something to spell check!
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2168 ;; (special start end)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2169 (setq shift (ispell-process-line string
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2170 (and recheckp shift))))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2171 (goto-char end)))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2172 (if ispell-quit
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2173 nil
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2174 (or shift 0)))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2175 ;; protected
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2176 (if (and (not (and recheckp ispell-keep-choices-win))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2177 (get-buffer ispell-choices-buffer))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2178 (kill-buffer ispell-choices-buffer))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2179 (if ispell-quit
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2180 (progn
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2181 ;; preserve or clear the region for ispell-continue.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2182 (if (not (numberp ispell-quit))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2183 (set-marker ispell-region-end nil)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2184 ;; Ispell-continue enabled - ispell-region-end is set.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2185 (goto-char ispell-quit))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2186 ;; Check for aborting
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2187 (if (and ispell-checking-message (numberp ispell-quit))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2188 (progn
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2189 (setq ispell-quit nil)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2190 (error "Message send aborted")))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2191 (if (not recheckp) (setq ispell-quit nil)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2192 (if (not recheckp) (set-marker ispell-region-end nil))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2193 ;; Only save if successful exit.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2194 (ispell-pdict-save ispell-silently-savep)
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2195 (message "Spell-checking done"))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2196
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2197
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2198 ;;; Creates the regexp for skipping a region.
22529
d9eac134a41b Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22526
diff changeset
2199 ;;; 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
2200 ;;; tex expressions to skip as well.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2201 ;;; Call AFTER ispell-buffer-local-parsing.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2202 (defun ispell-begin-skip-region-regexp ()
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2203 (let ((skip-regexp (ispell-begin-skip-region)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2204 (if (and (null ispell-check-comments) comment-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2205 (setq skip-regexp (concat (regexp-quote comment-start) "\\|"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2206 skip-regexp)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2207 (if (and (eq 'exclusive ispell-check-comments) comment-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2208 (setq skip-regexp (concat (if (string= "" comment-end) "^"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2209 (regexp-quote comment-end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2210 "\\|" skip-regexp)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2211 (if ispell-skip-tib
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2212 (setq skip-regexp (concat ispell-tib-ref-beginning "\\|" skip-regexp)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2213 (if ispell-skip-sgml
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2214 (setq skip-regexp (concat "<author>" "\\|"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2215 "<[cC][oO][dD][eE]>" "\\|"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2216 "<[vV][eE][rR][bB]>" "\\|"
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2217 ;; "<[tT][tT]>" "\\|"
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2218 "<[tT][tT]/" "\\|"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2219 "</" "\\|"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2220 "<" "\\|"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2221 "&" "\\|"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2222 skip-regexp)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2223 (if (eq ispell-parser 'tex)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2224 (setq skip-regexp (concat (ispell-begin-tex-skip-regexp) "\\|"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2225 skip-regexp)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2226 skip-regexp))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2227
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2228
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2229 (defun ispell-begin-tex-skip-regexp ()
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2230 "Regular expression of tex commands to skip.
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2231 Generated from `ispell-tex-skip-alists'."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2232 (concat
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2233 (mapconcat (function (lambda (lst) (car lst)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2234 (car ispell-tex-skip-alists)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2235 "\\|")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2236 "\\|"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2237 (mapconcat (function (lambda (lst)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2238 (concat "\\\\begin[ \t\n]*{[ \t\n]*"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2239 (car lst)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2240 "[ \t\n]*}")))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2241 (car (cdr ispell-tex-skip-alists))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2242 "\\|")))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2243
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2244
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2245 (defun ispell-begin-skip-region ()
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2246 "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
2247 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
2248 otherwise, the current line is skipped."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2249 (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
2250 (eval (car lst)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2251 ispell-skip-region-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2252 "\\|"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2253
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2254
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2255 (defun ispell-tex-arg-end (&optional arg)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2256 (condition-case nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2257 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2258 (while (looking-at "[ \t\n]*\\[") (forward-sexp))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2259 (forward-sexp (or arg 1)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2260 (error
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2261 (message "error skipping s-expressions at point %d." (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2262 (beep)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2263 (sit-for 2))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2264
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2265
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2266 ;;; 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
2267 ;;; Places point at end of region skipped.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2268 (defun ispell-skip-region (key alist)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2269 ;; move over key to begin checking.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2270 (forward-char (length key))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2271 (let ((start (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2272 alist-key null-skip)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2273 (cond
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2274 ;; what about quoted comment, or comment inside strings?
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2275 ((and (null ispell-check-comments) comment-start
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2276 (string= key comment-start))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2277 (if (string= "" comment-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2278 (forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2279 (search-forward comment-end ispell-region-end t)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2280 ((and (eq 'exclusive ispell-check-comments) comment-start
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2281 (string= key comment-end))
22526
56bcedfdbe83 (ispell-skip-region): Don't complain when
Karl Heuer <kwzh@gnu.org>
parents: 22461
diff changeset
2282 (search-forward comment-start ispell-region-end :end))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2283 ((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
2284 (re-search-forward ispell-tib-ref-end ispell-region-end t))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2285 ((and ispell-skip-sgml (string-match "<author>" key))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2286 (search-forward-regexp ".$" ispell-region-end t))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2287 ((and ispell-skip-sgml (string-match "</" key))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2288 (search-forward ">" ispell-region-end t))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2289 ((and ispell-skip-sgml (string-match "<[cC][oO][dD][eE]>" key))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2290 (search-forward-regexp "</[cC][oO][dD][eE]>" ispell-region-end t))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2291 ((and ispell-skip-sgml (string-match "<[vV][eE][rR][bB]>" key))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2292 (search-forward-regexp "</[vV][eE][rR][bB]>" ispell-region-end t))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2293 ;;((and ispell-skip-sgml (string-match "<[tT][tT]>" key))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2294 ;; (search-forward-regexp "</[tT][tT]>" ispell-region-end t))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2295 ((and ispell-skip-sgml (string-match "<[tT][tT]/" key))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2296 (search-forward "/" ispell-region-end t))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2297 ((and ispell-skip-sgml (string-match "<" key))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2298 (search-forward-regexp "[/>]" ispell-region-end t))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2299 ((and ispell-skip-sgml (string-match "&" key))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2300 (search-forward ";" ispell-region-end t))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2301 ;; markings from alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2302 (t
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2303 (while alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2304 (setq alist-key (eval (car (car alist))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2305 (if (string-match alist-key key)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2306 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2307 (setq alist (cdr (car alist)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2308 (cond
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2309 ((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
2310 ((not (consp alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2311 ;; 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
2312 (re-search-forward (eval alist) (point-max) t))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2313 ((consp alist)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2314 (if (stringp alist)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2315 (re-search-forward alist (point-max) t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2316 (setq null-skip t) ; error handling in functions!
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2317 (if (consp (cdr alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2318 (apply (car alist) (cdr alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2319 (funcall (car alist))))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2320 (setq alist nil))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2321 (setq alist (cdr alist))))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2322 (if (and (= start (point)) (null null-skip))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2323 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2324 (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
2325 key (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2326 (beep)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2327 (sit-for 2)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2328
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2329
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2330 ;;; Grab the next line of data.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2331 ;;; Returns a string with the line data
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2332 (defun ispell-get-line (start end reg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2333 (let ((ispell-casechars (ispell-get-casechars))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2334 string)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2335 (cond ; LOOK AT THIS LINE AND SKIP OR PROCESS
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2336 ((eolp) ; END OF LINE, just go to next line.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2337 (forward-line))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2338 ;;((looking-at "[---#@*+!%~^]") ; SKIP SPECIAL ISPELL CHARACTERS
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2339 ;; (forward-char 1)) ; not needed as quoted below.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2340 ((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
2341 (re-search-forward "[][()${}]" end t)) ; or MATH COMMANDS
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2342 (setq string (concat "^" (buffer-substring-no-properties start end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2343 "\n"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2344 (goto-char end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2345 (t (goto-char end))) ; EMPTY LINE, skip it.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2346 string))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2347
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2348
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2349 (defun ispell-process-line (string shift)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2350 "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
2351 This will modify the buffer for spelling errors.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2352 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
2353 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
2354 ;;(declare special start end)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2355 (let (poss accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2356 (if (not (numberp shift))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2357 (setq shift 0))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2358 ;; send string to spell process and get input.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2359 (process-send-string ispell-process string)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2360 (while (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2361 (accept-process-output ispell-process)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2362 ;; Last item of output contains a blank line.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2363 (not (string= "" (car ispell-filter)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2364 ;; 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
2365 ;; Place in FIFO order and remove the blank item.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2366 (setq ispell-filter (nreverse (cdr ispell-filter)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2367 (while (and (not ispell-quit) ispell-filter)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2368 ;; get next word, accounting for accepted words and start shifts
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2369 (setq poss (ispell-parse-output (car ispell-filter)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2370 accept-list shift))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2371 (if (and poss (listp poss)) ; spelling error occurred.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2372 ;; Whenever we have misspellings, we can change
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2373 ;; the buffer. Keep boundaries as markers.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2374 ;; Markers can move with highlighting! This destroys
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2375 ;; 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
2376 (let ((word-start
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2377 (copy-marker (+ start ispell-offset (car (cdr poss)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2378 (word-len (length (car poss)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2379 (line-end (copy-marker end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2380 (line-start (copy-marker start))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2381 recheck-region replace)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2382 (goto-char word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2383 ;; Adjust the horizontal scroll & point
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2384 (ispell-horiz-scroll)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2385 (goto-char (+ word-len word-start))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2386 (ispell-horiz-scroll)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2387 (goto-char word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2388 (ispell-horiz-scroll)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2389
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2390 ;; Alignment cannot be tracked and this error will occur when
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2391 ;; `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
2392 (if (/= (+ word-len (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2393 (progn
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2394 ;; 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
2395 ;; display properly. Ignore the error in this case?
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2396 (search-forward (car poss) (+ word-len (point)) t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2397 (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2398 ;; This occurs due to filter pipe problems
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2399 (error (concat "Ispell misalignment: word "
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2400 "`%s' point %d; probably incompatible versions")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2401 (car poss) (marker-position word-start)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2402 ;; ispell-cmd-loop can go recursive & change buffer
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2403 (if ispell-keep-choices-win
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2404 (setq replace (ispell-command-loop
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2405 (car (cdr (cdr poss)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2406 (car (cdr (cdr (cdr poss))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2407 (car poss) (marker-position word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2408 (+ word-len (marker-position word-start))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2409 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2410 (setq replace (ispell-command-loop
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2411 (car (cdr (cdr poss)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2412 (car (cdr (cdr (cdr poss))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2413 (car poss) (marker-position word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2414 (+ word-len (marker-position word-start))))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2415
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2416 (goto-char word-start)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2417 ;; Recheck when query replace edit changes misspelled word.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2418 ;; 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
2419 (if (and replace (listp replace) (= 2 (length replace)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2420 (if (and (eq ispell-parser 'tex)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2421 (string-match "[\\\\][]()[]\\|\\\\begin\\|\\$"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2422 (regexp-quote string)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2423 (error
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2424 "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
2425 )
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2426 (set-marker line-end (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2427 (setq ispell-filter nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2428 recheck-region t)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2429
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2430 ;; insert correction if needed
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2431 (cond
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2432 ((or (null replace)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2433 (equal 0 replace)) ; ACCEPT/INSERT
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2434 (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2435 (ispell-add-per-file-word-list (car poss)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2436 ;; do not recheck accepted word on this line
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2437 (setq accept-list (cons (car poss) accept-list)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2438 (t ; replacement word selected or entered
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2439 (delete-region (point) (+ word-len (point)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2440 (if (not (listp replace))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2441 (progn
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2442 (insert replace) ; insert dictionary word
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2443 (setq accept-list (cons replace accept-list)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2444 (let ((replace-word (car replace)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2445 ;; Recheck hand entered replacement word
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2446 (insert replace-word)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2447 (if (car (cdr replace))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2448 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2449 (delete-other-windows) ; to correctly show help.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2450 ;; Assume case-replace &
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2451 ;; case-fold-search correct?
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2452 (query-replace (car poss) (car replace) t)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2453 (goto-char word-start)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2454 ;; do not recheck if already accepted
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2455 (if (member replace-word accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2456 (setq accept-list (cons replace-word accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2457 replace replace-word)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2458 (let ((region-end (copy-marker ispell-region-end)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2459 (setq recheck-region ispell-filter
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2460 ispell-filter nil ; save filter
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2461 shift (ispell-region
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2462 word-start
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2463 (+ word-start (length replace-word))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2464 t shift))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2465 (if (null shift) ; quitting check.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2466 (setq shift 0))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2467 (set-marker ispell-region-end region-end)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2468 (set-marker region-end nil)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2469 (setq ispell-filter recheck-region
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2470 recheck-region nil
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2471 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
2472
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2473 (setq shift (+ shift (- (length replace) word-len)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2474
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2475 ;; Move line-start across word...
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2476 ;; new shift function does this now...
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2477 ;;(set-marker line-start (+ line-start
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2478 ;; (- (length replace)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2479 ;; (length (car poss)))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2480 ))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2481 (if (not ispell-quit)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2482 (let (message-log-max)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2483 (message "Continuing spelling check using %s dictionary..."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2484 (or ispell-dictionary "default"))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2485 (sit-for 0)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2486 (setq start (marker-position line-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2487 end (marker-position line-end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2488 ;; Adjust markers when end of region lost from highlighting.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2489 (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
2490 (setq end (+ word-start word-len)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2491 (if (= word-start ispell-region-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2492 (set-marker ispell-region-end (+ word-start word-len)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2493 ;; going out of scope - unneeded
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2494 (set-marker line-start nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2495 (set-marker word-start nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2496 (set-marker line-end nil)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2497 ;; finished with misspelling!
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2498 (setq ispell-filter (cdr ispell-filter)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2499 shift))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2500
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2501
20389
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
2502 ;;;###autoload
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
2503 (defun ispell-comments-and-strings ()
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
2504 "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
2505 (interactive)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
2506 (goto-char (point-min))
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
2507 (let (state done)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
2508 (while (not done)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
2509 (setq done t)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
2510 (setq state (parse-partial-sexp (point) (point-max)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
2511 nil nil state 'syntax-table))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2512 (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
2513 (let ((start (point)))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2514 (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
2515 nil nil state 'syntax-table))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2516 (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
2517 (error "Unterminated string or comment"))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2518 (save-excursion
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2519 (setq done (not (ispell-region start (point))))))))))
20389
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
2520
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2521
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2522 ;;;###autoload
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2523 (defun ispell-buffer ()
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2524 "Check the current buffer for spelling errors interactively."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2525 (interactive)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2526 (ispell-region (point-min) (point-max)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2527
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2528
6288
3197bf3cc0a1 (ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents: 6285
diff changeset
2529 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2530 (defun ispell-continue ()
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2531 "Continue a halted spelling session beginning with the current word."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2532 (interactive)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2533 (if (not (marker-position ispell-region-end))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2534 (message "No session to continue. Use 'X' command when checking!")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2535 (if (not (equal (marker-buffer ispell-region-end) (current-buffer)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2536 (message "Must continue ispell from buffer %s"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2537 (buffer-name (marker-buffer ispell-region-end)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2538 (ispell-region
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2539 ;; find beginning of current word:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2540 (car (cdr (ispell-get-word t)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2541 (marker-position ispell-region-end)))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2542
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2543
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2544 ;;; Horizontal scrolling
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2545 (defun ispell-horiz-scroll ()
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2546 "Places point within the horizontal visibility of its window area."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2547 (if truncate-lines ; display truncating lines?
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2548 ;; See if display needs to be scrolled.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2549 (let ((column (- (current-column) (max (window-hscroll) 1))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2550 (if (and (< column 0) (> (window-hscroll) 0))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2551 (scroll-right (max (- column) 10))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2552 (if (>= column (- (window-width) 2))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2553 (scroll-left (max (- column (window-width) -3) 10)))))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2554
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2555
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2556 ;;; Interactive word completion.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2557 ;;; Forces "previous-word" processing. Do we want to make this selectable?
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2558
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2559 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2560 (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
2561 "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
2562 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
2563 sequence inside of a word.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2564
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2565 Standard ispell choices are then available."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2566 (interactive "P")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2567 (let ((cursor-location (point))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2568 (case-fold-search-val case-fold-search)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2569 (word (ispell-get-word nil "\\*")) ; force "previous-word" processing.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2570 start end possibilities replacement)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2571 (setq start (car (cdr word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2572 end (car (cdr (cdr word)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2573 word (car word)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2574 possibilities
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2575 (or (string= word "") ; Will give you every word
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2576 (lookup-words (concat (and interior-frag "*") word
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2577 (if (or interior-frag (null ispell-look-p))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2578 "*"))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2579 ispell-complete-word-dict)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2580 (cond ((eq possibilities t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2581 (message "No word to complete"))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2582 ((null possibilities)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2583 (message "No match for \"%s\"" word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2584 (t ; There is a modification...
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2585 (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
2586 (cond
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2587 ((string-equal (upcase word) word)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2588 (setq possibilities (mapcar 'upcase possibilities)))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2589 ((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
2590 (setq possibilities (mapcar (function
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2591 (lambda (pos)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2592 (if (string-equal
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2593 (substring word 0 1)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2594 (substring pos 0 1))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2595 pos
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2596 (capitalize pos))))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2597 possibilities))))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2598 (setq case-fold-search case-fold-search-val)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2599 (save-window-excursion
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2600 (setq replacement
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2601 (ispell-command-loop possibilities nil word start end)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2602 (cond
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2603 ((equal 0 replacement) ; BUFFER-LOCAL ADDITION
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2604 (ispell-add-per-file-word-list word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2605 (replacement ; REPLACEMENT WORD
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2606 (delete-region start end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2607 (setq word (if (atom replacement) replacement (car replacement))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2608 cursor-location (+ (- (length word) (- end start))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2609 cursor-location))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2610 (insert word)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2611 (if (not (atom replacement)) ; recheck spelling of replacement.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2612 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2613 (goto-char cursor-location)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2614 (ispell-word nil t)))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2615 (if (get-buffer ispell-choices-buffer)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2616 (kill-buffer ispell-choices-buffer))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2617 (ispell-pdict-save ispell-silently-savep)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2618 (goto-char cursor-location)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2619
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2620
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2621 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2622 (defun ispell-complete-word-interior-frag ()
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2623 "Completes word matching character sequence inside a word."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2624 (interactive)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2625 (ispell-complete-word t))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2626
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2627
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2628 ;;; **********************************************************************
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2629 ;;; Ispell Minor Mode
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2630 ;;; **********************************************************************
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2631
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2632 (defvar ispell-minor-mode nil
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2633 "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
2634 ;; 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
2635 (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
2636
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2637 (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
2638 (setq minor-mode-alist
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2639 (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
2640
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2641 (defvar ispell-minor-keymap
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2642 (let ((map (make-sparse-keymap)))
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2643 (define-key map " " 'ispell-minor-check)
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2644 (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
2645 map)
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2646 "Keymap used for Ispell minor mode.")
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2647
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2648 (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
2649 (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
2650 (setq minor-mode-map-alist
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2651 (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
2652 minor-mode-map-alist)))
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2653
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2654 ;;;###autoload
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2655 (defun ispell-minor-mode (&optional arg)
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2656 "Toggle Ispell minor mode.
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2657 With prefix arg, turn Ispell minor mode on iff arg is positive.
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2658
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2659 In Ispell minor mode, pressing SPC or RET
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2660 warns you if the previous word is incorrectly spelled.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2661
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2662 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
2663 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
2664 (interactive "P")
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2665 (setq ispell-minor-mode
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2666 (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
2667 (<= (prefix-numeric-value arg) 0))))
11562
8ff50a0715e1 (ispell-minor-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents: 11469
diff changeset
2668 (force-mode-line-update))
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2669
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2670 (defun ispell-minor-check ()
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2671 "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
2672 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
2673 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
2674 (interactive "*")
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
2675 (let ((ispell-minor-mode nil)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2676 (ispell-check-only t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2677 (last-char (char-after (1- (point)))))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2678 (command-execute (key-binding (this-command-keys)))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2679 (if (not (or (eq last-char ?\ ) (eq last-char ?\n)
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2680 (and ispell-skip-sgml (eq last-char ?>))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2681 (and ispell-skip-sgml (eq last-char ?\;))))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2682 (ispell-word nil t))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2683
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2684
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2685 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2686 ;;; Ispell Message
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2687 ;;; **********************************************************************
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2688 ;;; 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
2689
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2690
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2691 (defvar ispell-message-text-end
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2692 (mapconcat (function identity)
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2693 '(
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2694 ;; Don't spell check signatures
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2695 "^-- $"
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2696 ;; Matches postscript files.
12260
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
2697 "^%!PS-Adobe-[123].0"
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2698 ;; Matches uuencoded text
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2699 "^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
2700 ;; Matches shell files (especially auto-decoding)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2701 "^#! /bin/[ck]?sh"
8387
7dca276b66d8 (ispell-message-text-end): Improve context diff regexp.
Richard M. Stallman <rms@gnu.org>
parents: 8298
diff changeset
2702 ;; Matches context difference listing
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2703 "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2704 ;; Matches unidiff difference listing
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2705 "\\(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
2706 ;; Matches reporter.el bug report
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2707 "^current state:\n==============\n"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2708 ;; Matches commonly used "cut" boundaries
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2709 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|Environment Follows\\)")
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2710 "\\|")
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2711 "*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
2712 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
2713 Otherwise, it must be a function which is called to get the limit.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2714
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2715
12260
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
2716
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2717 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2718 (defun ispell-message ()
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2719 "Check the spelling of a mail message or news post.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2720 Don't check spelling of message headers except the Subject field.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2721 Don't check included messages.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2722
15551
9cbd488c1872 (ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents: 15312
diff changeset
2723 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
2724 use the `x' command. (Any subsequent regions will be checked.)
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2725 The `X' command aborts the message send so that you can edit the buffer.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2726
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2727 To spell-check whenever a message is sent, include the appropriate lines
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2728 in your .emacs file:
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2729 (add-hook 'message-send-hook 'ispell-message) ;; GNUS 5
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2730 (add-hook 'news-inews-hook 'ispell-message) ;; GNUS 4
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2731 (add-hook 'mail-send-hook 'ispell-message)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2732 (add-hook 'mh-before-send-letter-hook 'ispell-message)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2733
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2734 You can bind this to the key C-c i in GNUS or mail by adding to
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2735 `news-reply-mode-hook' or `mail-mode-hook' the following lambda expression:
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2736 (function (lambda () (local-set-key \"\\C-ci\" 'ispell-message)))"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2737 (interactive)
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2738 (save-excursion
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2739 (goto-char (point-min))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2740 (let* (
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2741 ;; 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
2742 ;; Non-nil marker of end of headers.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2743 (internal-messagep
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2744 (re-search-forward
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2745 (concat "^" (regexp-quote mail-header-separator) "$") nil t))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2746 (end-of-headers ; Start of body.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2747 (copy-marker
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2748 (or internal-messagep
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2749 (re-search-forward "^$" nil t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2750 (point-min))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2751 (limit (copy-marker ; End of region we will spell check.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2752 (cond
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2753 ((not ispell-message-text-end) (point-max))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2754 ((char-or-string-p ispell-message-text-end)
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2755 (if (re-search-forward ispell-message-text-end nil t)
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2756 (match-beginning 0)
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2757 (point-max)))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2758 (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
2759 (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
2760 (if (and (boundp 'mail-yank-prefix) mail-yank-prefix)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2761 (ispell-non-empty-string mail-yank-prefix)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2762 " \\|\t"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2763 (cite-regexp ;Prefix of quoted text
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2764 (cond
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2765 ((featurep 'supercite) ; sc 3.0
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2766 (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2767 (ispell-non-empty-string sc-reference-tag-string)))
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2768 ((featurep 'sc) ; sc 2.3
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2769 (concat "\\(" sc-cite-regexp "\\)" "\\|"
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2770 (ispell-non-empty-string sc-reference-tag-string)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2771 ((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
2772 (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
2773 (concat "In article <" "\\|"
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2774 "[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2775 message-yank-prefix "\\|"
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2776 default-prefix))
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2777 ((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
2778 (concat "[^,;&+=\n]+ writes:" "\\|"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2779 (ispell-non-empty-string mh-ins-buf-prefix)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2780 ((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
2781 (concat "In [a-zA-Z.]+ you write:" "\\|"
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2782 "In <[^,;&+=]+> [^,;&+=]+ writes:" "\\|"
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2783 " *> *"))
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2784 ((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
2785 (concat "[^,;&+=\n]+ writes:" "\\|"
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
2786 (ispell-non-empty-string vm-included-text-prefix)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2787 (t default-prefix)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2788 (ispell-skip-region-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2789 (cons (list (concat "^\\(" cite-regexp "\\)")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2790 (function forward-line))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2791 ispell-skip-region-alist))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2792 (old-case-fold-search case-fold-search)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2793 (dictionary-alist ispell-message-dictionary-alist)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2794 (ispell-checking-message t))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2795
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2796 ;; Select dictionary for message
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2797 (or (local-variable-p 'ispell-local-dictionary (current-buffer))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2798 (while dictionary-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2799 (goto-char (point-min))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2800 (if (re-search-forward (car (car dictionary-alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2801 end-of-headers t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2802 (setq ispell-local-dictionary (cdr (car dictionary-alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2803 dictionary-alist nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2804 (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
2805
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2806 (unwind-protect
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2807 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2808 ;; Spell check any original Subject:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2809 (goto-char (point-min))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2810 (setq case-fold-search t)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2811 (if (re-search-forward "^Subject: *" end-of-headers t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2812 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2813 (goto-char (match-end 0))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2814 (if (and (not (looking-at ".*Re\\>"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2815 (not (looking-at "\\[")))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2816 (progn
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2817 (setq case-fold-search old-case-fold-search)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2818 (ispell-region (point)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2819 (progn ;Tab-initiated continuation lns.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2820 (end-of-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2821 (while (looking-at "\n[ \t]")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2822 (end-of-line 2))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2823 (point)))))))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2824 (setq case-fold-search old-case-fold-search)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2825 (goto-char end-of-headers)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2826 (forward-line 1)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2827 (ispell-region (point) limit))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2828 (set-marker end-of-headers nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2829 (set-marker limit nil)))))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2830
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2831
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2832 (defun ispell-non-empty-string (string)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2833 (if (or (not string) (string-equal string ""))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2834 "\\'\\`" ; An unmatchable string if string is null.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2835 (regexp-quote string)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2836
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2837
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2838 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2839 ;;; Buffer Local Functions
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2840 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2841
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2842
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2843 (defun ispell-accept-buffer-local-defs ()
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2844 "Load all buffer-local information, restarting Ispell when necessary."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2845 (ispell-buffer-local-dict) ; May kill ispell-process.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2846 (ispell-buffer-local-words) ; Will initialize ispell-process.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2847 (ispell-buffer-local-parsing))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2848
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2849
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2850 (defun ispell-buffer-local-parsing ()
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2851 "Place Ispell into parsing mode for this buffer.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2852 Overrides the default parsing mode.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2853 Includes Latex/Nroff modes and extended character mode."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2854 ;; (ispell-init-process) must already be called.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2855 (process-send-string ispell-process "!\n") ; Put process in terse mode.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2856 ;; 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
2857 ;; 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
2858 (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
2859 (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
2860 (string-match "[Tt][Ee][Xx]-mode"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2861 (symbol-name major-mode)))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2862 (eq ispell-parser 'tex)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2863 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2864 (process-send-string ispell-process "+\n") ; set ispell mode to tex
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2865 (if (not (eq ispell-parser 'tex))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2866 (set (make-local-variable 'ispell-parser) 'tex)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2867 (process-send-string ispell-process "-\n")) ; set mode to normal (nroff)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2868 ;; If needed, test for SGML & HTML modes and set a buffer local nil/t value.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2869 (if (and ispell-skip-sgml (not (eq ispell-skip-sgml t)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2870 (set (make-local-variable 'ispell-skip-sgml)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2871 (not (null (string-match "sgml\\|html"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2872 (downcase (symbol-name major-mode)))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2873 ;; Set default extended character mode for given buffer, if any.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2874 (let ((extended-char-mode (ispell-get-extended-character-mode)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2875 (if extended-char-mode
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2876 (process-send-string ispell-process (concat extended-char-mode "\n"))))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2877 ;; Set buffer-local parsing mode and extended character mode, if specified.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2878 (save-excursion
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2879 (goto-char (point-max))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2880 ;; Uses last occurrence of ispell-parsing-keyword
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2881 (if (search-backward ispell-parsing-keyword nil t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2882 (let ((end (save-excursion (end-of-line) (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2883 string)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2884 (search-forward ispell-parsing-keyword)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2885 (while (re-search-forward " *\\([^ \"]+\\)" end t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2886 ;; space separated definitions.
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2887 (setq string (downcase (buffer-substring-no-properties
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2888 (match-beginning 1) (match-end 1))))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2889 (cond ((and (string-match "latex-mode" string)
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2890 (not (eq 'exclusive ispell-check-comments)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2891 (process-send-string ispell-process "+\n~tex\n"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2892 ((string-match "nroff-mode" string)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2893 (process-send-string ispell-process "-\n~nroff\n"))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2894 ((string-match "~" string) ; Set extended character mode.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2895 (process-send-string ispell-process (concat string "\n")))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2896 (t (message "Invalid Ispell Parsing argument!")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2897 (sit-for 2))))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2898
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2899
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2900 ;;; Can kill the current ispell process
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2901
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2902 (defun ispell-buffer-local-dict ()
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2903 "Initializes local dictionary and local personal dictionary.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2904 When a dictionary is defined in the buffer (see variable
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2905 `ispell-dictionary-keyword'), it will override the local setting
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2906 from \\[ispell-change-dictionary].
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2907 Both should not be used to define a buffer-local dictionary."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2908 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2909 (goto-char (point-min))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2910 (let (end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2911 ;; Override the local variable definition.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2912 ;; Uses last occurrence of ispell-dictionary-keyword.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2913 (goto-char (point-max))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2914 (if (search-backward ispell-dictionary-keyword nil t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2915 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2916 (search-forward ispell-dictionary-keyword)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2917 (setq end (save-excursion (end-of-line) (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2918 (if (re-search-forward " *\\([^ \"]+\\)" end t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2919 (setq ispell-local-dictionary
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2920 (buffer-substring-no-properties (match-beginning 1)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2921 (match-end 1))))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2922 (goto-char (point-max))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2923 (if (search-backward ispell-pdict-keyword nil t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2924 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2925 (search-forward ispell-pdict-keyword)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2926 (setq end (save-excursion (end-of-line) (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2927 (if (re-search-forward " *\\([^ \"]+\\)" end t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2928 (setq ispell-local-pdict
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2929 (buffer-substring-no-properties (match-beginning 1)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2930 (match-end 1))))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2931 ;; Reload if new personal dictionary defined.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2932 (if (and ispell-local-pdict
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2933 (not (equal ispell-local-pdict ispell-personal-dictionary)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2934 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2935 (ispell-kill-ispell t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2936 (setq ispell-personal-dictionary ispell-local-pdict)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2937 ;; Reload if new dictionary defined.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2938 (if (and ispell-local-dictionary
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2939 (not (equal ispell-local-dictionary ispell-dictionary)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2940 (ispell-change-dictionary ispell-local-dictionary)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2941
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2942
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2943 (defun ispell-buffer-local-words ()
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2944 "Loads the buffer-local dictionary in the current buffer."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2945 (if (and ispell-buffer-local-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2946 (not (equal ispell-buffer-local-name (buffer-name))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2947 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2948 (ispell-kill-ispell t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2949 (setq ispell-buffer-local-name nil)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2950 (ispell-init-process)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2951 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2952 (goto-char (point-min))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2953 (while (search-forward ispell-words-keyword nil t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2954 (or ispell-buffer-local-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2955 (setq ispell-buffer-local-name (buffer-name)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2956 (let ((end (save-excursion (end-of-line) (point)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2957 (ispell-casechars (ispell-get-casechars))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2958 string)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2959 ;; 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
2960 ;; 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
2961 (while (re-search-forward " *\\([^ ]+\\)" end t)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2962 (setq string (buffer-substring-no-properties (match-beginning 1)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2963 (match-end 1)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2964 ;; 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
2965 ;; 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
2966 (if (and (< 1 (length string))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2967 (equal 0 (string-match ispell-casechars string)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2968 (process-send-string ispell-process
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2969 (concat "@" string "\n"))))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2970
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2971
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2972 ;;; returns optionally adjusted region-end-point.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2973
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2974 (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
2975 "Add WORD to the per-file word list."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2976 (or ispell-buffer-local-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2977 (setq ispell-buffer-local-name (buffer-name)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2978 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2979 (goto-char (point-min))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2980 (let ((old-case-fold-search case-fold-search)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2981 line-okay search done string)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2982 (while (not done)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2983 (setq case-fold-search nil
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2984 search (search-forward ispell-words-keyword nil 'move)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2985 line-okay (< (+ (length word) 1 ; 1 for space after word..
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2986 (progn (end-of-line) (current-column)))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2987 80)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2988 case-fold-search old-case-fold-search)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2989 (if (or (and search line-okay)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2990 (null search))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2991 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2992 (setq done t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2993 (if (null search)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2994 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2995 (open-line 1)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2996 (setq string (concat comment-start " "
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2997 ispell-words-keyword))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2998 (insert string)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2999 (if (and comment-end (not (equal "" comment-end)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3000 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3001 (open-line 1)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3002 (forward-line 1)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3003 (insert comment-end)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3004 (insert (concat " " word))))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3005
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3006
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3007 (provide 'ispell)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3008
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3009
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3010 ;;; LOCAL VARIABLES AND BUFFER-LOCAL VALUE EXAMPLES.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3011
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3012 ;;; Local Variable options:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3013 ;;; mode: name(-mode)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3014 ;;; eval: expression
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3015 ;;; local-variable: value
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3016
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3017 ;;; 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
3018 ;;; and spell checks only comments.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3019
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3020 ;;; Local Variables:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3021 ;;; mode: emacs-lisp
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3022 ;;; comment-column: 40
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3023 ;;; ispell-check-comments: exclusive
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3024 ;;; ispell-local-dictionary: "american"
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3025 ;;; End:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3026
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3027
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3028 ;;; MORE EXAMPLES OF ISPELL BUFFER-LOCAL VALUES
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3029
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3030 ;;; The following places this file in nroff parsing and extended char modes.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3031 ;;; Local IspellParsing: nroff-mode ~nroff
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3032 ;;; Change IspellPersDict to IspellPersDict: to enable the following line.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3033 ;;; Local IspellPersDict ~/.ispell_lisp
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3034 ;;; 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
3035 ; 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
3036 ; 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
3037 ; 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
3038 ; 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
3039 ; 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
3040 ; 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
3041 ; 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
3042 ; LocalWords: lns XEmacs HTML casechars Multibyte
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3043
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3044 ;;; ispell.el ends here