annotate lisp/textmodes/ispell.el @ 28616:313ef0d76864

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