annotate lisp/textmodes/ispell.el @ 70547:e184fae4f7dd

(field-at-point): New function.
author Nick Roberts <nickrob@snap.net.nz>
date Wed, 10 May 2006 00:32:34 +0000
parents 5c3e7e42952a
children 6a91e8b1eea0 146cd8369025
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 37545
diff changeset
1 ;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2
13337
84acc3adcd63 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 13092
diff changeset
2
64751
5b1a238fcbb4 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64196
diff changeset
3 ;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
68195
bb2dfb332355 (ispell-kill-ispell): Run new hook ispell-kill-ispell-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68169
diff changeset
4 ;; 2004, 2005, 2006 Free Software Foundation, Inc.
13337
84acc3adcd63 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 13092
diff changeset
5
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 37545
diff changeset
6 ;; Author: Ken Stevens <k.stevens@ieee.org>
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 37545
diff changeset
7 ;; Maintainer: Ken Stevens <k.stevens@ieee.org>
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
8 ;; Stevens Mod Date: Mon Jan 7 12:32:44 PST 2003
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
9 ;; Stevens Revision: 3.6
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
10 ;; Status : Release with 3.1.12+ and 3.2.0+ ispell.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
11 ;; Bug Reports : ispell-el-bugs@itcorp.com
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
12 ;; Web Site : http://kdstevens.com/~stevens/ispell-page.html
29208
15df28a6f99f Add Finder keywords.
Dave Love <fx@gnu.org>
parents: 29078
diff changeset
13 ;; Keywords: unix wp
13337
84acc3adcd63 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 13092
diff changeset
14
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
15 ;; This file is part of GNU Emacs.
13337
84acc3adcd63 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 13092
diff changeset
16
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
17 ;; 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
18 ;; 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
19 ;; 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
20 ;; any later version.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
21
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
22 ;; 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
23 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
24 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
25 ;; GNU General Public License for more details.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
26
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
27 ;; 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
28 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64084
a8fa7c632ee4 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 63822
diff changeset
29 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
a8fa7c632ee4 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 63822
diff changeset
30 ;; Boston, MA 02110-1301, USA.
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
31
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
32 ;; Note: version numbers and time stamp are not updated
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
33 ;; when this file is edited for release with GNU emacs.
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
34
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
35 ;;; Commentary:
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
36
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
37 ;; INSTRUCTIONS
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
38
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
39 ;; This code contains a section of user-settable variables that you
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
40 ;; should inspect prior to installation. Look past the end of the history
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
41 ;; list. Set them up for your locale and the preferences of the majority
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
42 ;; of the users. Otherwise the users may need to set a number of variables
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
43 ;; themselves.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
44 ;; You particularly may want to change the default dictionary for your
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
45 ;; country and language.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
46 ;; Most dictionary changes should be made in this file so all users can
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
47 ;; enjoy them. Local or modified dictionaries are supported in your .emacs
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
48 ;; file. Use the variable `ispell-local-dictionary-alist' to specify
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
49 ;; your own dictionaries.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
50
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
51 ;; 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
52 ;; (add-hook 'news-inews-hook 'ispell-message)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
53 ;; (add-hook 'mail-send-hook 'ispell-message)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
54 ;; (add-hook 'mh-before-send-letter-hook 'ispell-message)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
55
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
56 ;; Ispell has a TeX parser and a nroff parser (the default).
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
57 ;; The parsing is controlled by the variable ispell-parser. Currently
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
58 ;; 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
59 ;; added it will be updated. See the variable description for more info.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
60
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
61
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
62 ;; TABLE OF CONTENTS
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
63
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
64 ;; ispell-word
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
65 ;; ispell-region
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
66 ;; ispell-buffer
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
67 ;; ispell-message
20389
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
68 ;; ispell-comments-and-strings
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
69 ;; ispell-continue
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
70 ;; ispell-complete-word
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
71 ;; ispell-complete-word-interior-frag
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
72 ;; ispell-change-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
73 ;; ispell-kill-ispell
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
74 ;; ispell-pdict-save
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
75 ;; ispell-skip-region-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
76
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
77 ;; Commands in ispell-region:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
78 ;; Character replacement: Replace word with choice. May query-replace.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
79 ;; ` ': Accept word this time.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
80 ;; `i': Accept word and insert into private dictionary.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
81 ;; `a': Accept word for this session.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
82 ;; `A': Accept word and place in buffer-local dictionary.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
83 ;; `r': Replace word with typed-in value. Rechecked.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
84 ;; `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
85 ;; `?': Show these commands
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
86 ;; `x': Exit spelling buffer. Move cursor to original point.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
87 ;; `X': Exit spelling buffer. Leaves cursor at the current point, and permits
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
88 ;; the check to be completed later.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
89 ;; `q': Quit spelling session (Kills ispell process).
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
90 ;; `l': Look up typed-in replacement in alternate dictionary. Wildcards okay.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
91 ;; `u': Like `i', but the word is lower-cased first.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
92 ;; `m': Place entered value in personal dictionary, then recheck current word.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
93 ;; `C-l': redraws screen
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
94 ;; `C-r': recursive edit
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
95 ;; `C-z': suspend emacs or iconify frame
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
96
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
97 ;; Buffer-Local features:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
98 ;; 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
99 ;; ispell for the current buffer. This includes language dictionaries,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
100 ;; personal dictionaries, parsing, and local word spellings. Each of these
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
101 ;; local customizations are done either through local variables, or by
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
102 ;; 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
103 ;; 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
104 ;; examples. The local keywords and variables are:
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
105
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
106 ;; ispell-dictionary-keyword language-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
107 ;; uses local variable ispell-local-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
108 ;; ispell-pdict-keyword personal-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
109 ;; uses local variable ispell-local-pdict
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
110 ;; ispell-parsing-keyword mode-arg extended-char-arg
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
111 ;; ispell-words-keyword any number of local word spellings
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
112
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
113 ;; Region skipping:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
114 ;; Place new regular expression definitions of regions you prefer not to
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
115 ;; spell check in `ispell-skip-region-alist'. Mode-dependent features can
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
116 ;; be added to latex by modifying `ispell-tex-skip-alists'.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
117 ;; `ispell-message' contains some custom skipping code for e-mail messages.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
118
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
119 ;; BUGS:
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
120 ;; Need a way to select between different character mappings without separate
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
121 ;; dictionary entries.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
122 ;; Multi-byte characters if not defined by current dictionary may result in the
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
123 ;; evil "misalignment error" in some versions of MULE emacs.
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
124 ;; On some versions of emacs, growing the minibuffer fails.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
125 ;; see `ispell-help-in-bufferp'.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
126 ;; Recursive edits (?C-r or ?R) inside a keyboard text replacement check (?r)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
127 ;; can cause misalignment errors.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
128
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
129 ;; HISTORY
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
130
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
131 ;; Modifications made in latest versions:
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
132
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
133 ;; Revision 3.6 2003/01/07 12:32:44 kss
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
134 ;; Removed extra -d LIB in dictionary defs. (Pavel Janik)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
135 ;; Filtered process calls with duplicate dictionary entries.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
136 ;; Fixed bug where message-text-end is inside a mime skipped region.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
137 ;; Minor fixes to get ispell menus right in XEmacs
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
138 ;; Fixed skip regexp so it doesn't match stuff like `/.\w'.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
139 ;; Detecting dictionary change not working. Fixed. kss
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
140 ;; function `ispell-change-dictionary' now only completes valid dicts.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
141
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
142 ;; Revision 3.5 2001/7/11 18:43:57 kss
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
143 ;; Added fix for aspell to work in XEmacs (ispell-check-version).
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
144 ;; Added Portuguese dictionary definition.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
145 ;; New feature: MIME mail message support, Fcc support.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
146 ;; Bug fix: retain comment syntax on lines with region skipping. (TeX $ bug...)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
147 ;; Improved allocation for graphic mode lines. (Miles Bader)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
148 ;; Support -v flag for old versions of aspell. (Eli Zaretskii)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
149 ;; Clear minibuffer on ^G from ispell-help (Tak Ota)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
150
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
151 ;; Revision 3.4 2000/8/4 09:41:50 kss
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
152 ;; Support new color display functions.
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
153 ;; Fixed misalignment offset bug when replacing a string after a shift made.
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
154 ;; Set to standard Author/Maintainer heading,
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
155 ;; ensure localwords lists are separated from the text by newline. (Dave Love)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
156 ;; Added dictionary definition for Italian (William Deakin)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
157 ;; HTML region skipping greatly improved. (Chuck D. Phillips)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
158 ;; improved menus. Fixed regexp matching http/email addresses.
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
159 ;; one arg always for xemacs sleep-for (gunnar Evermann)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
160 ;; support for synchronous processes (Eli Zaretskii)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
161
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
162 ;; Revision 3.3 1999/11/29 11:38:34 kss
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
163 ;; Only word replacements entered in from the keyboard are rechecked.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
164 ;; This fixes a bug in tex parsing and misalignment.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
165 ;; Exceptions exist for recursive edit and query-replace, with tex error
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
166 ;; condition tested. Recursive editing improved.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
167 ;; XEmacs repair for when `enable-multibyte-characters' defined - Didier Verna.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
168 ;; ispell-help fixed for XEmacs. Choices minibuffer now displayed in XEmacs.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
169 ;; Only list valid dictionaries in Spell menu. Russian dictionary doesn't allow
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
170 ;; run-together words, and uses koi8-r font. Don't skip text in html <TT>
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
171 ;; fonts.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
172
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
173 ;; Revision 3.2 1999/5/7 14:25:14 kss
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
174 ;; Accept ispell versions 3.X.Y where X>=1
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
175 ;; fine tuned latex region skipping. Fixed bug in ispell-word that did not
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
176 ;; point in right place on words < 2 chars. Simplified ispell-minor-mode.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
177 ;; Fixed bug in TeX parsing when math commands are in the comments.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
178 ;; Removed calls to `when' macro.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
179
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
180 ;; Revision 3.1 1998/12/1 13:21:52 kss
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
181 ;; Improved and fixed customize support.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
182 ;; Improved and fixed comments in variables and messages.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
183 ;; A coding system is now required for all languages.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
184 ;; casechars improved for castellano, castellano8, and norsk dictionaries.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
185 ;; Dictionary norsk7-tex removed. Dictionary polish added.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
186 ;; Dictionaries redefined at load-time to support dictionary changes.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
187 ;; Menu redefined at load time to support dictionary changes.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
188 ;; ispell-check-version added as an alias for `check-ispell-version'.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
189 ;; Spelling suggestions returned in order generated by ispell.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
190 ;; Small bug fixed in matching ispell error messages.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
191 ;; Robustness added to ensure `case-fold-search' doesn't get redefined.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
192 ;; Fixed bug that didn't respect case of word in `ispell-complete-word'.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
193 ;; Multibyte character coding support added for process interactions.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
194 ;; Ensure ispell process has terminated before starting new process.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
195 ;; This can otherwise confuse process filters and hang ispell.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
196 ;; Improved skipping support for SGML.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
197 ;; Fixed bug using ^M rather than \r in `ispell-minor-check'.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
198 ;; Improved message reference matching in `ispell-message'.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
199 ;; Fixed bug in returning to nroff mode from tex mode.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
200
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
201
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
202 ;;; Code:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
203
65262
330e799da016 (mail-yank-prefix): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 64965
diff changeset
204 (defvar mail-yank-prefix)
330e799da016 (mail-yank-prefix): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 64965
diff changeset
205
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
206 ;;; Custom.el macros require recompiling this when they are not present.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
207 ;;; Add in backward compatible custom support.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
208 (eval-when-compile
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
209 (if (not (fboundp 'defcustom))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
210 (defmacro defcustom (symbol value doc &rest args)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
211 "Empty replacement for defcustom when not supplied."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
212 `(defvar ,symbol ,value ,doc))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
213
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
214 (eval-when-compile
48374
a6f9803f174f (defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46733
diff changeset
215 (if (not (fboundp 'defgroup))
a6f9803f174f (defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46733
diff changeset
216 (defmacro defgroup (&rest args)
a6f9803f174f (defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46733
diff changeset
217 "Empty replacement for defgroup when not supplied.")))
a6f9803f174f (defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46733
diff changeset
218
a6f9803f174f (defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46733
diff changeset
219 (defgroup ispell nil
a6f9803f174f (defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46733
diff changeset
220 "User variables for emacs ispell interface."
a6f9803f174f (defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46733
diff changeset
221 :group 'applications)
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
222
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
223 (if (not (fboundp 'buffer-substring-no-properties))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
224 (defun buffer-substring-no-properties (start end)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
225 (buffer-substring start end)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
226
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
227 (defalias 'check-ispell-version 'ispell-check-version)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
228
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
229 ;;; **********************************************************************
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
230 ;;; The following variables should be set according to personal preference
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
231 ;;; and location of binaries:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
232 ;;; **********************************************************************
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
233
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
234
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
235 ;;; ******* THIS FILE IS WRITTEN FOR ISPELL VERSION 3.1+
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
236
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
237 (defcustom ispell-highlight-p 'block
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
238 "*Highlight spelling errors when non-nil.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
239 When set to `block', assumes a block cursor with TTY displays."
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
240 :type '(choice (const block) (const :tag "off" nil) (const :tag "on" t))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
241 :group 'ispell)
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
242
60714
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
243 (defcustom ispell-lazy-highlight (boundp 'lazy-highlight-cleanup)
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
244 "*Controls the lazy-highlighting of spelling errors.
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
245 When non-nil, all text in the buffer matching the current spelling
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
246 error is highlighted lazily using isearch lazy highlighting (see
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
247 `lazy-highlight-initial-delay' and `lazy-highlight-interval')."
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
248 :type 'boolean
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
249 :group 'lazy-highlight
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
250 :group 'ispell
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
251 :version "22.1")
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
252
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
253 (defcustom ispell-highlight-face (if ispell-lazy-highlight 'isearch 'highlight)
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
254 "*The face used for Ispell highlighting. For Emacses with overlays.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
255 Possible values are `highlight', `modeline', `secondary-selection',
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
256 `region', and `underline'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
257 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
258 It's most convenient if the cursor color and highlight color are
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
259 slightly different."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
260 :type 'face
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
261 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
262
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
263 (defcustom ispell-check-comments t
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
264 "*Spelling of comments checked when non-nil.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
265 When set to `exclusive', ONLY comments are checked. (For code comments).
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
266 Warning! Not checking comments, when a comment start is embedded in strings,
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
267 may produce undesired results."
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
268 :type '(choice (const exclusive) (const :tag "off" nil) (const :tag "on" t))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
269 :group 'ispell)
69818
684aaf007d39 * files.el: Move some `safe-local-variable' declarations to the
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69556
diff changeset
270 ;;;###autoload(put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive))))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
271
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
272 (defcustom ispell-query-replace-choices nil
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
273 "*Corrections made throughout region when non-nil.
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
274 Uses `query-replace' (\\[query-replace]) for corrections."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
275 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
276 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
277
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
278 (defcustom ispell-skip-tib nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
279 "*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
280 Skips any text between strings matching regular expressions
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
281 `ispell-tib-ref-beginning' and `ispell-tib-ref-end'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
282
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
283 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
284 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
285 a [.5mm] type of number...."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
286 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
287 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
288
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
289 (defvar ispell-tib-ref-beginning "[[<]\\."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
290 "Regexp matching the beginning of a Tib reference.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
291
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
292 (defvar ispell-tib-ref-end "\\.[]>]"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
293 "Regexp matching the end of a Tib reference.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
294
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
295 (defcustom ispell-keep-choices-win t
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
296 "*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
297 This minimizes redisplay thrashing."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
298 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
299 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
300
32685
afd8474f34ae (ispell-mode-line-window-height-fudge):
Miles Bader <miles@gnu.org>
parents: 30954
diff changeset
301 (defcustom ispell-choices-win-default-height 2
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
302 "*The default size of the `*Choices*' window, including mode line.
32685
afd8474f34ae (ispell-mode-line-window-height-fudge):
Miles Bader <miles@gnu.org>
parents: 30954
diff changeset
303 Must be greater than 1."
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
304 :type 'integer
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
305 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
306
62156
12ab35f4126a (ispell-program-name): Try looking for "aspell" along exec-path,
Eli Zaretskii <eliz@gnu.org>
parents: 60985
diff changeset
307 (defcustom ispell-program-name
12ab35f4126a (ispell-program-name): Try looking for "aspell" along exec-path,
Eli Zaretskii <eliz@gnu.org>
parents: 60985
diff changeset
308 (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p)
12ab35f4126a (ispell-program-name): Try looking for "aspell" along exec-path,
Eli Zaretskii <eliz@gnu.org>
parents: 60985
diff changeset
309 "ispell")
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
310 "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
311 :type 'string
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
312 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
313
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
314 (defcustom ispell-alternate-dictionary
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
315 (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
316 ((file-exists-p "/usr/share/dict/web2") "/usr/share/dict/web2")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
317 ((file-exists-p "/usr/dict/words") "/usr/dict/words")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
318 ((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
319 ((file-exists-p "/usr/share/dict/words") "/usr/share/dict/words")
38644
f1184d540c06 (ispell-alternate-dictionary): Add /usr/share/lib/dict/words, for Irix.
Eli Zaretskii <eliz@gnu.org>
parents: 38436
diff changeset
320 ((file-exists-p "/usr/share/lib/dict/words")
f1184d540c06 (ispell-alternate-dictionary): Add /usr/share/lib/dict/words, for Irix.
Eli Zaretskii <eliz@gnu.org>
parents: 38436
diff changeset
321 "/usr/share/lib/dict/words")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
322 ((file-exists-p "/sys/dict") "/sys/dict")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
323 (t "/usr/dict/words"))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
324 "*Alternate dictionary for spelling help."
24795
a7afe99e73cf (ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents: 24737
diff changeset
325 :type '(choice file (const :tag "None" nil))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
326 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
327
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
328 (defcustom ispell-complete-word-dict ispell-alternate-dictionary
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
329 "*Dictionary used for word completion."
24795
a7afe99e73cf (ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents: 24737
diff changeset
330 :type '(choice file (const :tag "None" nil))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
331 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
332
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
333 (defcustom ispell-message-dictionary-alist nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
334 "*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
335 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
336 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
337 DICTIONARY if `ispell-local-dictionary' is not buffer-local.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
338 E.g. you may use the following value:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
339 '((\"^Newsgroups:[ \\t]*de\\\\.\" . \"deutsch8\")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
340 (\"^To:[^\\n,]+\\\\.de[ \\t\\n,>]\" . \"deutsch8\"))"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
341 :type '(repeat (cons regexp string))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
342 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
343
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
344
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
345 (defcustom ispell-message-fcc-skip 50000
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
346 "*Query before saving Fcc message copy if attachment larger than this value.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
347 Always stores Fcc copy of message when nil."
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
348 :type '(choice integer (const :tag "off" nil))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
349 :group 'ispell)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
350
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
351
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
352 (defcustom ispell-grep-command "egrep"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
353 "Name of the grep command for search processes."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
354 :type 'string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
355 :group 'ispell)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
356
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
357 (defcustom ispell-grep-options "-i"
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
358 "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
359 Should probably be \"-i\" or \"-e\".
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
360 Some machines (like the NeXT) don't support \"-i\""
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
361 :type 'string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
362 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
363
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
364 (defcustom ispell-look-command
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
365 (cond ((file-exists-p "/bin/look") "/bin/look")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
366 ((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
367 ((file-exists-p "/usr/bin/look") "/usr/bin/look")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
368 (t "look"))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
369 "Name of the look command for search processes.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
370 This must be an absolute file name."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
371 :type 'file
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
372 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
373
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
374 (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
375 "*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
376 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
377 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
378 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
379
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
380 (defcustom ispell-have-new-look nil
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
381 "*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
382 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
383 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
384
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
385 (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
386 "String of command options for `ispell-look-command'."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
387 :type 'string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
388 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
389
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
390 (defcustom ispell-use-ptys-p nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
391 "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
392 When nil, Emacs uses pipes."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
393 :type 'boolean
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
394 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
395
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
396 (defcustom ispell-following-word nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
397 "*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
398 Otherwise `ispell-word' checks the preceding word."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
399 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
400 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
401
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
402 (defcustom ispell-help-in-bufferp nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
403 "*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
404 The following values are supported:
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
405 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
406 there for a couple of seconds.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
407 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
408 for a couple of seconds.
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
409 electric Pop up a new buffer and display a long help message there.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
410 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
411 :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
412 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
413
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
414 (defcustom ispell-quietly nil
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
415 "*Non-nil means suppress messages in `ispell-word'."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
416 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
417 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
418
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
419 (defcustom ispell-format-word (function upcase)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
420 "*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
421 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
422 :type 'function
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
423 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
424
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
425 (defcustom ispell-use-framepop-p nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
426 "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
427 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
428 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
429 (and window-system (condition-case () (require 'framepop) (error nil)))"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
430 :type 'boolean
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
431 :group 'ispell)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
432
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
433 ;;;###autoload
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
434 (defcustom ispell-personal-dictionary nil
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
435 "*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
436 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
437 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
438 :type '(choice file
fa6f38bb8ac1 (ispell-personal-dictionary): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19785
diff changeset
439 (const :tag "default" nil))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
440 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
441
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
442 (defcustom ispell-silently-savep nil
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
443 "*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
444 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
445 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
446
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
447 (defvar ispell-local-dictionary-overridden nil
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
448 "Non-nil means the user has explicitly set this buffer's Ispell dictionary.")
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
449 (make-variable-buffer-local 'ispell-local-dictionary-overridden)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
450
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
451 (defcustom ispell-local-dictionary nil
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
452 "If non-nil, the dictionary to be used for Ispell commands in this buffer.
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
453 The value must be a string dictionary name,
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
454 or nil, which means use the global setting in `ispell-dictionary'.
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
455 Dictionary names are defined in `ispell-local-dictionary-alist'
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
456 and `ispell-dictionary-alist',
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
457
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
458 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
459 calling \\[ispell-change-dictionary] with that value. This variable
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
460 is automatically set when defined in the file with either
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
461 `ispell-dictionary-keyword' or the Local Variable syntax."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
462 :type '(choice string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
463 (const :tag "default" nil))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
464 :group 'ispell)
69830
196122ba0b05 * subr.el (string-or-null-p): New function.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69818
diff changeset
465 ;;;###autoload(put 'ispell-local-dictionary 'safe-local-variable 'string-or-null-p)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
466
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
467 (make-variable-buffer-local 'ispell-local-dictionary)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
468
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
469 (defcustom ispell-extra-args nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
470 "*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
471 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
472 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
473 for language-specific arguments."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
474 :type '(repeat string)
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
475 :group 'ispell)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
476
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
477
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
478
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
479 (defcustom ispell-skip-html 'use-mode-name
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
480 "*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
481 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
482 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
483 buffer's major mode."
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
484 :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
485 (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
486 :group 'ispell)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
487
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
488 (make-variable-buffer-local 'ispell-skip-html)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
489
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
490
24737
4a18ef61578d (ispell-local-dictionary-alist): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 24701
diff changeset
491 ;;;###autoload
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
492 (defcustom ispell-local-dictionary-alist nil
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
493 "*List of local or customized dictionary definitions.
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
494 These can override the values in `ispell-dictionary-alist'.
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
495
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
496 To make permanent changes to your dictionary definitions, you
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
497 will need to make your changes in this variable, save, and then
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
498 re-start emacs."
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
499 :type '(repeat (list (choice :tag "Dictionary"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
500 (string :tag "Dictionary name")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
501 (const :tag "default" nil))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
502 (regexp :tag "Case characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
503 (regexp :tag "Non case characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
504 (regexp :tag "Other characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
505 (boolean :tag "Many other characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
506 (repeat :tag "Ispell command line args"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
507 (string :tag "Arg"))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
508 (choice :tag "Extended character mode"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
509 (const "~tex") (const "~plaintex")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
510 (const "~nroff") (const "~list")
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
511 (const "~latin1") (const "~latin3")
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
512 (const :tag "default" nil))
68958
feebf8fa84ad (ispell-local-dictionary-alist): Accept as valid any coding-system
Eli Zaretskii <eliz@gnu.org>
parents: 68951
diff changeset
513 (coding-system :tag "Coding System")))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
514 :group 'ispell)
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
515
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
516
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
517 ;;; 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
518
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
519 ;;; 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
520 ;;;###autoload
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
521 (setq
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
522 ispell-dictionary-alist-1
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
523 '((nil ; default (English.aff)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
524 "[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
525 ("american" ; Yankee English
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
526 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
527 ("brasileiro" ; Brazilian mode
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
528 "[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
529 "[^A-Z\301\311\315\323\332\300\310\314\322\331\303\325\307\334\302\312\324a-z\341\351\355\363\372\340\350\354\362\371\343\365\347\374\342\352\364]"
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
530 "[']" nil nil nil iso-8859-1)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
531 ("british" ; British version
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
532 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
533 ("castellano" ; Spanish mode
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
534 "[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
535 "[^A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]"
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
536 "[-]" nil ("-B") "~tex" iso-8859-1)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
537 ("castellano8" ; 8 bit Spanish mode
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
538 "[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
539 "[^A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]"
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
540 "[-]" nil ("-B" "-d" "castellano") "~latin1" iso-8859-1)))
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
541
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
542
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
543 ;;; 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
544 ;;;###autoload
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
545 (setq
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
546 ispell-dictionary-alist-2
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
547 '(("czech"
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
548 "[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
549 "[^A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]"
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
550 "" nil ("-B") nil iso-8859-2)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
551 ("dansk" ; Dansk.aff
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
552 "[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
553 "[']" nil ("-C") nil iso-8859-1)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
554 ("deutsch" ; Deutsch.aff
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
555 "[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
556 ("deutsch8"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
557 "[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
558 "[^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
559 "[']" 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
560 ("english" ; make English explicitly selectable
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
561 "[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
562
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
563
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
564 ;;; 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
565 ;;;###autoload
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
566 (setq
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
567 ispell-dictionary-alist-3
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
568 '(("esperanto"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
569 "[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
570 "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]"
68958
feebf8fa84ad (ispell-local-dictionary-alist): Accept as valid any coding-system
Eli Zaretskii <eliz@gnu.org>
parents: 68951
diff changeset
571 "[-']" t ("-C") "~latin3" iso-8859-3)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
572 ("esperanto-tex"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
573 "[A-Za-z^\\]" "[^A-Za-z^\\]"
68958
feebf8fa84ad (ispell-local-dictionary-alist): Accept as valid any coding-system
Eli Zaretskii <eliz@gnu.org>
parents: 68951
diff changeset
574 "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-3)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
575 ("francais7"
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
576 "[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
577 ("francais" ; Francais.aff
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
578 "[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
579 "[^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]"
66556
64988dc86619 (ispell-dictionary-alist-5): Add . as boundarychar for Polish.
Richard M. Stallman <rms@gnu.org>
parents: 66343
diff changeset
580 "[-'.@]" t nil "~list" iso-8859-1)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
581 ("francais-tex" ; Francais.aff
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
582 "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]"
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
583 "[^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\\]"
66556
64988dc86619 (ispell-dictionary-alist-5): Add . as boundarychar for Polish.
Richard M. Stallman <rms@gnu.org>
parents: 66343
diff changeset
584 "[-'^`\".@]" t nil "~tex" iso-8859-1)))
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
585
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
586
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
587 ;;; 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
588 ;;;###autoload
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
589 (setq
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
590 ispell-dictionary-alist-4
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
591 '(("german" ; german.aff
39186
44a2e1c9db0c (ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents: 38644
diff changeset
592 "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
593 ("german8" ; german.aff
39186
44a2e1c9db0c (ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents: 38644
diff changeset
594 "[a-zA-Z\304\326\334\344\366\337\374]"
44a2e1c9db0c (ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents: 38644
diff changeset
595 "[^a-zA-Z\304\326\334\344\366\337\374]"
44a2e1c9db0c (ispell-dictionary-alist-4): Add "german"
Eli Zaretskii <eliz@gnu.org>
parents: 38644
diff changeset
596 "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
597 ("italiano" ; Italian.aff
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
598 "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]"
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
599 "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]"
66556
64988dc86619 (ispell-dictionary-alist-5): Add . as boundarychar for Polish.
Richard M. Stallman <rms@gnu.org>
parents: 66343
diff changeset
600 "[-.]" nil ("-B" "-d" "italian") "~tex" iso-8859-1)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
601 ("nederlands" ; Nederlands.aff
59723
08c7f3c89c0b (ispell-dictionary-alist-4): Rewrite the CASECHARS and NOT-CASECHARS
Lute Kamstra <lute@gnu.org>
parents: 59627
diff changeset
602 "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]"
08c7f3c89c0b (ispell-dictionary-alist-4): Rewrite the CASECHARS and NOT-CASECHARS
Lute Kamstra <lute@gnu.org>
parents: 59627
diff changeset
603 "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]"
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
604 "[']" t ("-C") nil iso-8859-1)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
605 ("nederlands8" ; Dutch8.aff
59723
08c7f3c89c0b (ispell-dictionary-alist-4): Rewrite the CASECHARS and NOT-CASECHARS
Lute Kamstra <lute@gnu.org>
parents: 59627
diff changeset
606 "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]"
08c7f3c89c0b (ispell-dictionary-alist-4): Rewrite the CASECHARS and NOT-CASECHARS
Lute Kamstra <lute@gnu.org>
parents: 59627
diff changeset
607 "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]"
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
608 "[']" t ("-C") nil iso-8859-1)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
609
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
610
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
611 ;;; Fifth part of dictionary, shortened for loaddefs.el
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
612 ;;;###autoload
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
613 (setq
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
614 ispell-dictionary-alist-5
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
615 '(("norsk" ; 8 bit Norwegian mode
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
616 "[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
617 "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]"
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
618 "[\"]" nil nil "~list" iso-8859-1)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
619 ("norsk7-tex" ; 7 bit Norwegian TeX mode
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
620 "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]"
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
621 "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
622 ("polish" ; Polish mode
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
623 "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]"
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
624 "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]"
66556
64988dc86619 (ispell-dictionary-alist-5): Add . as boundarychar for Polish.
Richard M. Stallman <rms@gnu.org>
parents: 66343
diff changeset
625 "." nil nil nil iso-8859-2)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
626 ("portugues" ; Portuguese mode
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
627 "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]"
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
628 "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]"
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
629 "[']" t ("-C") "~latin1" iso-8859-1)))
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
630
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
631
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
632 ;;; 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
633 ;;;###autoload
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
634 (setq
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
635 ispell-dictionary-alist-6
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
636 ;; include Russian iso coding system too?
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
637 ;; "[']" t ("-d" "russian") "~latin1" iso-8859-1
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
638 '(("russian" ; Russian.aff (KOI8-R charset)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
639 "[\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
640 "[^\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]"
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
641 "" nil nil nil koi8-r)
55605
776d61afa493 (ispell-local-dictionary-alist): Add
Eli Zaretskii <eliz@gnu.org>
parents: 55514
diff changeset
642 ("russianw" ; russianw.aff (CP1251 charset)
776d61afa493 (ispell-local-dictionary-alist): Add
Eli Zaretskii <eliz@gnu.org>
parents: 55514
diff changeset
643 "[\300\301\302\303\304\305\250\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\334\333\332\335\336\337\340\341\342\343\344\345\270\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\374\373\372\375\376\377]"
776d61afa493 (ispell-local-dictionary-alist): Add
Eli Zaretskii <eliz@gnu.org>
parents: 55514
diff changeset
644 "[^\300\301\302\303\304\305\250\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\334\333\332\335\336\337\340\341\342\343\344\345\270\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\374\373\372\375\376\377]"
776d61afa493 (ispell-local-dictionary-alist): Add
Eli Zaretskii <eliz@gnu.org>
parents: 55514
diff changeset
645 "" nil nil nil windows-1251)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
646 ("slovak" ; Slovakian
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
647 "[A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]"
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
648 "[^A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]"
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
649 "" nil ("-B") nil iso-8859-2)
60985
e1c4e103c69f (ispell-dictionary-alist-6): Add slovenian.
Eli Zaretskii <eliz@gnu.org>
parents: 60714
diff changeset
650 ("slovenian" ; Slovenian
e1c4e103c69f (ispell-dictionary-alist-6): Add slovenian.
Eli Zaretskii <eliz@gnu.org>
parents: 60714
diff changeset
651 "[A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]"
e1c4e103c69f (ispell-dictionary-alist-6): Add slovenian.
Eli Zaretskii <eliz@gnu.org>
parents: 60714
diff changeset
652 "[^A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]"
e1c4e103c69f (ispell-dictionary-alist-6): Add slovenian.
Eli Zaretskii <eliz@gnu.org>
parents: 60714
diff changeset
653 "" nil ("-B" "-d" "slovenian") nil iso-8859-2)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
654 ("svenska" ; Swedish mode
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
655 "[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
656 "[^A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]"
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
657 "[']" nil ("-C") "~list" iso-8859-1)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
658
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
659
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
660 ;;;###autoload
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
661 (defvar ispell-dictionary-alist
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
662 (append ispell-dictionary-alist-1 ispell-dictionary-alist-2
24468
381eed7518c2 (ispell-dictionary-alist-1): Shorten autoloaded line.
Karl Heuer <kwzh@gnu.org>
parents: 24422
diff changeset
663 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
664 ispell-dictionary-alist-5 ispell-dictionary-alist-6)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
665 "An alist of dictionaries and their associated parameters.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
666
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
667 Each element of this list is also a list:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
668
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
669 \(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
670 ISPELL-ARGS EXTENDED-CHARACTER-MODE CHARACTER-SET\)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
671
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
672 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
673 nil means the default dictionary.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
674
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
675 CASECHARS is a regular expression of valid characters that comprise a
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
676 word.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
677
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
678 NOT-CASECHARS is the opposite regexp of CASECHARS.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
679
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
680 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
681 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
682 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
683 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
684 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
685 \"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
686 \"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
687 If you want OTHERCHARS to be empty, use the empty string.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
688 Hint: regexp syntax requires the hyphen to be declared first here.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
689
60182
a8e43a2ba867 (ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 59907
diff changeset
690 CASECHAS, NOT-CASECHARS, and OTHERCHARS must be a unibyte string
a8e43a2ba867 (ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 59907
diff changeset
691 containing bytes of CHARACTER-SET. In addition, if they contain
a8e43a2ba867 (ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 59907
diff changeset
692 a non-ASCII byte, the regular expression must be a single
a8e43a2ba867 (ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 59907
diff changeset
693 `character set' construct that doesn't specify a character range
a8e43a2ba867 (ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 59907
diff changeset
694 for non-ASCII bytes.
a8e43a2ba867 (ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 59907
diff changeset
695
19183
aaf5a3f7a2bd (ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 17955
diff changeset
696 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
697 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
698 single word.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
699
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
700 ISPELL-ARGS is a list of additional arguments passed to the ispell
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
701 subprocess.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
702
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
703 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
704 have been configured in an Ispell affix file. (For example, umlauts
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
705 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
706 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
707 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
708 but the dictionary can control the extended character mode.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
709 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
710 `ispell-parsing-keyword' for details on this.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
711
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
712 CHARACTER-SET used for languages with multibyte characters.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
713
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
714 Note that the CASECHARS and OTHERCHARS slots of the alist should
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
715 contain the same character set as casechars and otherchars in the
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
716 LANGUAGE.aff file \(e.g., english.aff\).")
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
717
56932
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
718 (defvar ispell-really-aspell nil) ; Non-nil if aspell extensions should be used
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
719
65571
9cf0204bd600 (ispell-aspell-supports-utf8): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 65433
diff changeset
720 (defvar ispell-aspell-supports-utf8 nil
9cf0204bd600 (ispell-aspell-supports-utf8): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 65433
diff changeset
721 "Non-nil means to try to automatically find aspell dictionaries.
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
722 This is set to t in `ispell-check-version' for aspell >= 0.60.
65571
9cf0204bd600 (ispell-aspell-supports-utf8): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 65433
diff changeset
723
9cf0204bd600 (ispell-aspell-supports-utf8): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 65433
diff changeset
724 Earlier aspell versions do not consistently support UTF-8. Handling
9cf0204bd600 (ispell-aspell-supports-utf8): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 65433
diff changeset
725 this would require some extra guessing in `ispell-aspell-find-dictionary'.")
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
726
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
727
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
728
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
729 ;;; **********************************************************************
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
730 ;;; 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
731 ;;; **********************************************************************
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
732
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
733
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
734
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
735 ;;; 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
736 ;;; 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
737 (defconst ispell-required-version '(3 1 12)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
738 "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
739 (defvar ispell-offset -1
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
740 "Offset that maps protocol differences between ispell 3.1 versions.")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
741
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
742 (defconst ispell-version "ispell.el 3.6 - 7-Jan-2003")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
743
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
744
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
745 (defun ispell-check-version (&optional interactivep)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
746 "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
747 Returns version number if called interactively.
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
748 Otherwise returns the library directory name, if that is defined."
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
749 ;; 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
750 ;; 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
751 ;; 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
752 ;; 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
753 ;; 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
754 ;; 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
755 ;; themselves on startup.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
756 (interactive "p")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
757 (let ((case-fold-search-val case-fold-search)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
758 ;; avoid bugs when syntax of `.' changes in various default modes
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
759 (default-major-mode 'fundamental-mode)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
760 (default-directory (or (and (boundp 'temporary-file-directory)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
761 temporary-file-directory)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
762 default-directory))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
763 result status)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
764 (save-excursion
46733
fc2f7f66ce57 (check-ispell-version): Bind default-directory
Richard M. Stallman <rms@gnu.org>
parents: 45605
diff changeset
765 (let ((buf (get-buffer " *ispell-tmp*")))
fc2f7f66ce57 (check-ispell-version): Bind default-directory
Richard M. Stallman <rms@gnu.org>
parents: 45605
diff changeset
766 (if buf (kill-buffer buf)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
767 (set-buffer (get-buffer-create " *ispell-tmp*"))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
768 (erase-buffer)
58494
d3f27661a6ab (ispell-check-version): If default-directory is nonexistent, use home dir.
Richard M. Stallman <rms@gnu.org>
parents: 57937
diff changeset
769 (unless (file-exists-p default-directory)
d3f27661a6ab (ispell-check-version): If default-directory is nonexistent, use home dir.
Richard M. Stallman <rms@gnu.org>
parents: 57937
diff changeset
770 (setq default-directory (expand-file-name "~/")))
34632
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
771 (setq status (call-process
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
772 ispell-program-name nil t nil
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
773 ;; aspell doesn't accept the -vv switch.
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
774 (let ((case-fold-search
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
775 (memq system-type '(ms-dos windows-nt)))
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
776 (speller
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
777 (file-name-nondirectory ispell-program-name)))
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
778 ;; Assume anything that isn't `aspell' is Ispell.
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
779 (if (string-match "\\`aspell" speller) "-v" "-vv"))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
780 (goto-char (point-min))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
781 (if interactivep
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
782 ;; report version information of ispell and ispell.el
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
783 (progn
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
784 (end-of-line)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
785 (setq result (concat (buffer-substring-no-properties (point-min)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
786 (point))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
787 ", "
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
788 ispell-version))
65583
703495630901 Message format spec fixes (2)
Deepak Goel <deego@gnufans.org>
parents: 65571
diff changeset
789 (message "%s" result))
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
790 ;; return library directory.
34131
63a3259e1b50 (check-ispell-version): Don't use match-beginning
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33353
diff changeset
791 (if (re-search-forward "LIBDIR = \\\"\\([^ \t\n]*\\)\\\"" nil t)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
792 (setq result (buffer-substring (match-beginning 1) (match-end 1)))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
793 (goto-char (point-min))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
794 (if (not (memq status '(0 nil)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
795 (error "%s exited with %s %s" ispell-program-name
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
796 (if (stringp status) "signal" "code") status))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
797 (setq case-fold-search t
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
798 status (re-search-forward
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
799 (concat "\\<\\("
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
800 (format "%d" (car ispell-required-version))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
801 "\\)\\.\\([0-9]*\\)\\.\\([0-9]*\\)\\>")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
802 nil t)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
803 case-fold-search case-fold-search-val)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
804 (if (or (not status) ; major version mismatch
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
805 (< (car (read-from-string (match-string-no-properties 2)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
806 (car (cdr ispell-required-version)))) ; minor version mismatch
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
807 (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
808 ispell-program-name (car ispell-required-version)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
809 (car (cdr ispell-required-version))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
810 (car (cdr (cdr ispell-required-version))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
811 ;; check that it is the correct version.
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
812 (if (and (= (car (read-from-string (match-string-no-properties 2)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
813 (car (cdr ispell-required-version)))
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
814 (< (car (read-from-string (match-string-no-properties 3)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
815 (car (cdr (cdr ispell-required-version)))))
56932
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
816 (setq ispell-offset 0))
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
817 ;; Check to see if it's really aspell.
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
818 (goto-char (point-min))
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
819 (let (case-fold-search)
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
820 (setq ispell-really-aspell
65571
9cf0204bd600 (ispell-aspell-supports-utf8): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 65433
diff changeset
821 (and (search-forward-regexp
65929
252e6b444949 (ispell-check-version):
Richard M. Stallman <rms@gnu.org>
parents: 65834
diff changeset
822 "(but really Aspell \\(.*?\\)\\(-[0-9]+\\)?)" nil t)
65571
9cf0204bd600 (ispell-aspell-supports-utf8): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 65433
diff changeset
823 (progn
9cf0204bd600 (ispell-aspell-supports-utf8): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 65433
diff changeset
824 (setq ispell-aspell-supports-utf8
9cf0204bd600 (ispell-aspell-supports-utf8): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 65433
diff changeset
825 (not (version< (match-string 1) "0.60")))
65433
5386c7235881 (ispell-check-version): Signal an error if aspell version is less than 0.60.
Eli Zaretskii <eliz@gnu.org>
parents: 65262
diff changeset
826 t)))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
827 (kill-buffer (current-buffer)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
828 result))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
829
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
830
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
831
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
832 ;;; 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
833 ;;; 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
834 ;;; 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
835
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
836
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
837 ;;;###autoload
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
838 (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
839 ;;; 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
840 (setq ispell-menu-map nil)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
841
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
842 ;;;###autoload
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
843 (defvar ispell-menu-xemacs nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
844 "Spelling menu for XEmacs.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
845 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
846 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
847
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
848 ;;; 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
849 ;;; 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
850
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
851 ;;; Set up dictionary
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
852 ;;;###autoload
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
853 (defvar ispell-menu-map-needed
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
854 ;; 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
855 (and (not ispell-menu-map)
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
856 (not (featurep 'xemacs))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
857 'reload))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
858
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
859 (defvar ispell-library-directory (condition-case ()
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
860 (ispell-check-version)
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
861 (error nil))
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
862 "Directory where ispell dictionaries reside.")
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
863
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
864 (defvar ispell-process nil
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
865 "The process object for Ispell.")
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
866
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
867 (defvar ispell-async-processp (and (fboundp 'kill-process)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
868 (fboundp 'process-send-string)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
869 (fboundp 'accept-process-output)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
870 ;;(fboundp 'start-process)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
871 ;;(fboundp 'set-process-filter)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
872 ;;(fboundp 'process-kill-without-query)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
873 )
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
874 "Non-nil means that the OS supports asynchronous processes.")
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
875
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
876 ;; Make ispell.el work better with aspell.
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
877
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
878 (defvar ispell-have-aspell-dictionaries nil
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
879 "Non-nil if we have queried Aspell for dictionaries at least once.")
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
880
65670
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
881 (defun ispell-maybe-find-aspell-dictionaries ()
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
882 "Find Aspell's dictionaries, unless already done."
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
883 (when (and (not ispell-have-aspell-dictionaries)
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
884 (condition-case ()
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
885 (progn (ispell-check-version) t)
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
886 (error nil))
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
887 ispell-really-aspell
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
888 ispell-aspell-supports-utf8)
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
889 (ispell-find-aspell-dictionaries)))
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
890
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
891 (defun ispell-find-aspell-dictionaries ()
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
892 "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'."
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
893 (unless ispell-really-aspell
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
894 (error "This function only works with aspell"))
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
895 (let* ((dictionaries
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
896 (split-string
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
897 (with-temp-buffer
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
898 (call-process ispell-program-name nil t nil "dicts")
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
899 (buffer-string))))
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
900 ;; Search for the named dictionaries.
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
901 (found
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
902 (delq nil
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
903 (mapcar #'ispell-aspell-find-dictionary dictionaries))))
69395
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
904 ;; Ensure aspell's alias dictionary will override standard
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
905 ;; definitions.
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
906 (setq found (ispell-aspell-add-aliases found))
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
907 ;; Merge into FOUND any elements from the standard ispell-dictionary-alist
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
908 ;; which have no element in FOUND at all.
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
909 (dolist (dict ispell-dictionary-alist)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
910 (unless (assoc (car dict) found)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
911 (setq found (nconc found (list dict)))))
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
912 (setq ispell-dictionary-alist found)
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
913 ;; Add a default entry
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
914 (let* ((english-dict (assoc "en" ispell-dictionary-alist))
68426
e7649e83dff6 (ispell-find-aspell-dictionaries): If no English aspell dictionary is
Eli Zaretskii <eliz@gnu.org>
parents: 68198
diff changeset
915 (default-dict
e7649e83dff6 (ispell-find-aspell-dictionaries): If no English aspell dictionary is
Eli Zaretskii <eliz@gnu.org>
parents: 68198
diff changeset
916 (cons nil (or (cdr english-dict)
e7649e83dff6 (ispell-find-aspell-dictionaries): If no English aspell dictionary is
Eli Zaretskii <eliz@gnu.org>
parents: 68198
diff changeset
917 (cdr (car ispell-dictionary-alist-1))))))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
918 (push default-dict ispell-dictionary-alist))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
919 (setq ispell-have-aspell-dictionaries t)))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
920
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
921 (defvar ispell-aspell-data-dir nil
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
922 "Data directory of Aspell.")
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
923
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
924 (defvar ispell-aspell-dict-dir nil
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
925 "Dictionary directory of Aspell.")
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
926
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
927 (defun ispell-get-aspell-config-value (key)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
928 "Return value of Aspell configuration option KEY.
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
929 Assumes that value contains no whitespace."
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
930 (with-temp-buffer
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
931 (call-process ispell-program-name nil t nil "config" key)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
932 (car (split-string (buffer-string)))))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
933
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
934 (defun ispell-aspell-find-dictionary (dict-name)
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
935 ;; This returns nil if the data file does not exist.
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
936 ;; Can someone please explain the return value format when the
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
937 ;; file does exist -- rms?
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
938 (let* ((lang ;; Strip out region, variant, etc.
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
939 (and (string-match "^[[:alpha:]]+" dict-name)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
940 (match-string 0 dict-name)))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
941 (data-file
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
942 (concat (or ispell-aspell-data-dir
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
943 (setq ispell-aspell-data-dir
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
944 (ispell-get-aspell-config-value "data-dir")))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
945 "/" lang ".dat"))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
946 otherchars)
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
947 (condition-case ()
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
948 (with-temp-buffer
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
949 (insert-file-contents data-file)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
950 ;; There is zero or one line with special characters declarations.
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
951 (when (search-forward-regexp "^special" nil t)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
952 (let ((specials (split-string
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
953 (buffer-substring (point)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
954 (progn (end-of-line) (point))))))
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
955 ;; The line looks like: special ' -** - -** . -** : -*-
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
956 ;; -** means that this character
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
957 ;; - doesn't appear at word start
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
958 ;; * may appear in the middle of a word
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
959 ;; * may appear at word end
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
960 ;; `otherchars' is about the middle case.
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
961 (while specials
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
962 (when (eq (aref (cadr specials) 1) ?*)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
963 (push (car specials) otherchars))
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
964 (setq specials (cddr specials)))))
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
965 (list dict-name
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
966 "[[:alpha:]]"
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
967 "[^[:alpha:]]"
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
968 (regexp-opt otherchars)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
969 t ; We can't tell, so set this to t
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
970 (list "-d" dict-name "--encoding=utf-8")
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
971 nil ; aspell doesn't support this
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
972 ;; Here we specify the encoding to use while communicating with
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
973 ;; aspell. This doesn't apply to command line arguments, so
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
974 ;; just don't pass words to spellcheck as arguments...
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
975 'utf-8))
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
976 (file-error
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
977 nil))))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
978
69395
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
979 (defun ispell-aspell-add-aliases (alist)
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
980 "Find aspell's dictionary aliases and add them to dictionary ALIST.
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
981 Return the new dictionary alist."
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
982 (let ((aliases (file-expand-wildcards
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
983 (concat (or ispell-aspell-dict-dir
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
984 (setq ispell-aspell-dict-dir
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
985 (ispell-get-aspell-config-value "dict-dir")))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
986 "/*.alias"))))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
987 (dolist (alias-file aliases)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
988 (with-temp-buffer
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
989 (insert-file-contents alias-file)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
990 ;; Look for a line "add FOO.multi", extract FOO
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
991 (when (search-forward-regexp "^add \\([^.]+\\)\\.multi" nil t)
65262
330e799da016 (mail-yank-prefix): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 64965
diff changeset
992 (let* ((aliasname (file-name-sans-extension
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
993 (file-name-nondirectory alias-file)))
69395
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
994 (already-exists-p (assoc aliasname alist))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
995 (realname (match-string 1))
69395
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
996 (realdict (assoc realname alist)))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
997 (when (and realdict (not already-exists-p))
69395
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
998 (push (cons aliasname (cdr realdict)) alist))))))
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
999 alist))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1000
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1001 (defun ispell-valid-dictionary-list ()
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1002 "Returns a list of valid dictionaries.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1003 The variable `ispell-library-directory' defines the library location."
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1004 ;; If Ispell is really Aspell, query it for the dictionary list.
65670
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
1005 (ispell-maybe-find-aspell-dictionaries)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1006 (let ((dicts (append ispell-local-dictionary-alist ispell-dictionary-alist))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1007 (dict-list (cons "default" nil))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1008 name load-dict)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1009 (dolist (dict dicts)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1010 (setq name (car dict)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1011 load-dict (car (cdr (member "-d" (nth 5 dict)))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1012 ;; Include if the dictionary is in the library, or dir not defined.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1013 (if (and
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1014 name
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1015 ;; include all dictionaries if lib directory not known.
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1016 ;; For Aspell, we already know which dictionaries exist.
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1017 (or ispell-really-aspell
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1018 (not ispell-library-directory)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1019 (file-exists-p (concat ispell-library-directory
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1020 "/" name ".hash"))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1021 (file-exists-p (concat ispell-library-directory "/" name ".has"))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1022 (and load-dict
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1023 (or (file-exists-p (concat ispell-library-directory
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1024 "/" load-dict ".hash"))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1025 (file-exists-p (concat ispell-library-directory
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1026 "/" load-dict ".has"))))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1027 (setq dict-list (cons name dict-list))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1028 dict-list))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1029
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1030 ;;; 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
1031 ;;;###autoload
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
1032 (if ispell-menu-map-needed
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
1033 (progn
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1034 (setq ispell-menu-map (make-sparse-keymap "Spell"))
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
1035 (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
1036 '(menu-item "Change Dictionary..." ispell-change-dictionary
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
1037 :help "Supply explicit dictionary file name"))
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
1038 (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
1039 '(menu-item "Kill Process" ispell-kill-ispell
30954
1a632863b632 (ispell-menu-map-needed): Put back the boundp
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30945
diff changeset
1040 :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
1041 (eq (ispell-process-status) 'run))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1042 :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
1043 (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
1044 '(menu-item "Save Dictionary"
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1045 (lambda () (interactive) (ispell-pdict-save t t))
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1046 :help "Save personal dictionary"))
43383
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1047 (define-key ispell-menu-map [ispell-customize]
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1048 '(menu-item "Customize..."
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1049 (lambda () (interactive) (customize-group 'ispell))
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1050 :help "Customize spell checking options"))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1051 (define-key ispell-menu-map [ispell-help]
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1052 ;; use (x-popup-menu last-nonmenu-event(list "" ispell-help-list)) ?
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1053 '(menu-item "Help"
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1054 (lambda () (interactive) (describe-function 'ispell-help))
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1055 :help "Show standard Ispell keybindings and commands"))
43383
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1056 (define-key ispell-menu-map [flyspell-mode]
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1057 '(menu-item "Automatic spell checking (Flyspell)"
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1058 flyspell-mode
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1059 :help "Check spelling while you edit the text"
63166
5ccb3fdd9847 (ispell-menu-map-needed): flyspell-mode could be void.
Lute Kamstra <lute@gnu.org>
parents: 63139
diff changeset
1060 :button (:toggle . (bound-and-true-p flyspell-mode))))
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
1061 (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
1062 '(menu-item "Complete Word" ispell-complete-word
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1063 :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
1064 (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
1065 '(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
1066 :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
1067
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
1068 ;;;###autoload
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
1069 (if ispell-menu-map-needed
7890
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
1070 (progn
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
1071 (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
1072 '(menu-item "Continue Spell-Checking" ispell-continue
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1073 :enable (and (boundp 'ispell-region-end)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1074 (marker-position ispell-region-end)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1075 (equal (marker-buffer ispell-region-end)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1076 (current-buffer)))
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1077 :help "Continue spell checking last region"))
8822
33a3f424c8c3 (ispell-menu-map): Order menu items by size: buffer > region > word.
Karl Heuer <kwzh@gnu.org>
parents: 8803
diff changeset
1078 (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
1079 '(menu-item "Spell-Check Word" ispell-word
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1080 :help "Spell-check word at cursor"))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1081 (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
1082 '(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
1083 :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
1084
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
1085 ;;;###autoload
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
1086 (if ispell-menu-map-needed
8725
e4e6dc1e1be8 Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 8676
diff changeset
1087 (progn
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1088 (define-key ispell-menu-map [ispell-region]
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1089 '(menu-item "Spell-Check Region" ispell-region
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1090 :enable mark-active
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1091 :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
1092 (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
1093 '(menu-item "Spell-Check Message" ispell-message
69394
8255fc213e0f (ispell-menu-map-needed) [ispell-message]: Be visible only if major mode
Eli Zaretskii <eliz@gnu.org>
parents: 68958
diff changeset
1094 :visible (eq major-mode 'mail-mode)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1095 :help "Skip headers and included message text"))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1096 (define-key ispell-menu-map [ispell-buffer]
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1097 '(menu-item "Spell-Check Buffer" ispell-buffer
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1098 :help "Check spelling of selected buffer"))
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1099 ;;(put 'ispell-region 'menu-enable 'mark-active)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1100 (fset 'ispell-menu-map (symbol-value 'ispell-menu-map))))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1101
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1102 ;;; XEmacs versions 19 & 20
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
1103 (if (and (featurep 'xemacs)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1104 (featurep 'menubar)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1105 ;;(null ispell-menu-xemacs)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1106 (not (and (boundp 'infodock-version) infodock-version)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1107 (let ((dicts (if (fboundp 'ispell-valid-dictionary-list)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1108 (reverse (ispell-valid-dictionary-list))))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1109 (current-menubar (or current-menubar default-menubar))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1110 (menu
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1111 '(["Help" (describe-function 'ispell-help) t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1112 ;;["Help" (popup-menu ispell-help-list) t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1113 ["Check Message" ispell-message t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1114 ["Check Buffer" ispell-buffer t]
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1115 ["Check Comments" ispell-comments-and-strings t]
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1116 ["Check Word" ispell-word t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1117 ["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
1118 ["Continue Check" ispell-continue t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1119 ["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
1120 ["Complete Word" ispell-complete-word t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1121 ["Kill Process" ispell-kill-ispell t]
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1122 ["Customize..." (customize-group 'ispell) t]
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1123 ;; flyspell-mode may not be bound...
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1124 ;;["flyspell" flyspell-mode
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1125 ;; :style toggle :selected flyspell-mode ]
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1126 "-"
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1127 ["Save Personal Dict"(ispell-pdict-save t t) t]
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1128 ["Change Dictionary" ispell-change-dictionary t])))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1129 (if (null dicts)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1130 (setq dicts (cons "default" nil)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1131 (dolist (name dicts)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1132 (setq menu (append menu
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1133 (list
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1134 (vector
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1135 (concat "Select " (capitalize name))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1136 (list 'ispell-change-dictionary name)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1137 t)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1138 (setq ispell-menu-xemacs menu)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1139 (if current-menubar
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1140 (progn
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1141 (if (car (find-menu-item current-menubar '("Cmds")))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1142 (progn
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1143 ;; XEmacs 21.2
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1144 (delete-menu-item '("Cmds" "Spell-Check"))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1145 (add-menu '("Cmds") "Spell-Check" ispell-menu-xemacs))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1146 ;; previous
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1147 (delete-menu-item '("Edit" "Spell")) ; in case already defined
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1148 (add-menu '("Edit") "Spell" ispell-menu-xemacs))))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1149
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1150 ;;; Allow incrementing characters as integers in XEmacs 20
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
1151 (if (and (featurep 'xemacs)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1152 (fboundp 'int-char))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1153 (fset 'ispell-int-char 'int-char)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1154 ;; Emacs and XEmacs 19 or earlier
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1155 (fset 'ispell-int-char 'identity))
6138
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
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1158 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1159
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1160
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1161 ;;; This variable contains the current dictionary being used if the ispell
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1162 ;;; process is running.
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1163 (defvar ispell-current-dictionary nil
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1164 "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
1165 This is passed to the ispell process using the `-d' switch and is
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1166 used as key in `ispell-local-dictionary-alist' and `ispell-dictionary-alist'.")
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1167
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
1168 (defvar ispell-current-personal-dictionary nil
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
1169 "The name of the current personal dictionary, or nil for the default.
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
1170 This is passed to the ispell process using the `-p' switch.")
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
1171
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1172 (defvar ispell-dictionary nil
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1173 "Default dictionary to use if `ispell-local-dictionary' is nil.")
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1174
19644
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
1175 (defun ispell-decode-string (str)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1176 "Decodes multibyte character strings.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1177 Protects against bogus binding of `enable-multibyte-characters' in XEmacs."
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
1178 (if (and (or (featurep 'xemacs)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1179 (and (boundp 'enable-multibyte-characters)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1180 enable-multibyte-characters))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1181 (fboundp 'decode-coding-string)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1182 (ispell-get-coding-system))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1183 (decode-coding-string str (ispell-get-coding-system))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1184 str))
19644
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
1185
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1186 (put 'ispell-unified-chars-table 'char-table-extra-slots 0)
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1187
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1188 ;; Char-table that maps an Unicode character (charset:
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1189 ;; latin-iso8859-1, mule-unicode-0100-24ff, mule-unicode-2500-34ff) to
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1190 ;; a string in which all equivalent characters are listed.
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1191
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1192 (defconst ispell-unified-chars-table
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1193 (let ((table (make-char-table 'ispell-unified-chars-table)))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1194 (map-char-table
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1195 #'(lambda (c v)
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1196 (if (and v (/= c v))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1197 (let ((unified (or (aref table v) (string v))))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1198 (aset table v (concat unified (string c))))))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1199 ucs-mule-8859-to-mule-unicode)
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1200 table))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1201
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1202 ;; Return a string decoded from Nth element of the current dictionary
59627
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
1203 ;; while splicing equivalent characters into the string. This splicing
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1204 ;; is done only if the string is a regular expression of the form
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1205 ;; "[...]" because, otherwise, splicing will result in incorrect
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1206 ;; regular expression matching.
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1207
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1208 (defun ispell-get-decoded-string (n)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1209 (let* ((slot (or
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1210 (assoc ispell-current-dictionary ispell-local-dictionary-alist)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1211 (assoc ispell-current-dictionary ispell-dictionary-alist)))
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1212 (str (nth n slot)))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1213 (when (and (> (length str) 0)
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1214 (not (multibyte-string-p str)))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1215 (setq str (ispell-decode-string str))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1216 (if (and (= (aref str 0) ?\[)
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1217 (eq (string-match "\\]" str) (1- (length str))))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1218 (setq str
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1219 (string-as-multibyte
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1220 (mapconcat
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1221 #'(lambda (c)
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1222 (let ((unichar (aref ucs-mule-8859-to-mule-unicode c)))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1223 (if unichar
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1224 (aref ispell-unified-chars-table unichar)
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1225 (string c))))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1226 str ""))))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1227 (setcar (nthcdr n slot) str))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1228 str))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1229
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1230 (defun ispell-get-casechars ()
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1231 (ispell-get-decoded-string 1))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1232 (defun ispell-get-not-casechars ()
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1233 (ispell-get-decoded-string 2))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1234 (defun ispell-get-otherchars ()
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1235 (ispell-get-decoded-string 3))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1236 (defun ispell-get-many-otherchars-p ()
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1237 (nth 4 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1238 (assoc ispell-current-dictionary ispell-dictionary-alist))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1239 (defun ispell-get-ispell-args ()
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1240 (nth 5 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1241 (assoc ispell-current-dictionary ispell-dictionary-alist))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1242 (defun ispell-get-extended-character-mode ()
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1243 (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1244 (assoc ispell-current-dictionary ispell-dictionary-alist))))
19644
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
1245 (defun ispell-get-coding-system ()
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1246 (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1247 (assoc ispell-current-dictionary ispell-dictionary-alist))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1248
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1249
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1250 (defvar ispell-pdict-modified-p nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1251 "Non-nil means personal dictionary has modifications to be saved.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1252
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1253 ;;; 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
1254 ;;; When non-nil, the spell session is terminated.
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1255 ;;; 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
1256 (defvar ispell-quit nil)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1257
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1258 (defvar ispell-process-directory nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1259 "The directory where `ispell-process' was started.")
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1260
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1261 (defvar ispell-filter nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1262 "Output filter from piped calls to Ispell.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1263
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1264 (defvar ispell-filter-continue nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1265 "Control variable for Ispell filter function.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1266
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1267 (defvar ispell-output-buffer nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1268 "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
1269
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1270 (defvar ispell-session-buffer nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1271 "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
1272
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1273 (defvar ispell-cmd-args nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1274 "Command-line arguments to pass to a synchronous Ispell subprocess.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1275
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1276 (defvar ispell-query-replace-marker (make-marker)
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1277 "Marker for `query-replace' processing.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1278
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1279 (defvar ispell-recursive-edit-marker (make-marker)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1280 "Marker for return point from recursive edit.")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1281
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1282 (defvar ispell-checking-message nil
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1283 "Non-nil when we're checking a mail message.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1284 Set to the MIME boundary locations when checking messages.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1285
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1286 (defconst ispell-choices-buffer "*Choices*")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1287
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1288 (defvar ispell-overlay nil "Overlay variable for Ispell highlighting.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1289
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1290 ;;; *** Buffer Local Definitions ***
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1291
49599
5ade352e8d1c Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49535
diff changeset
1292 (defconst ispell-words-keyword "LocalWords: "
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1293 "The keyword for local oddly-spelled words to accept.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1294 The keyword will be followed by any number of local word spellings.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1295 There can be multiple of these keywords in the file.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1296
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1297 (defconst ispell-dictionary-keyword "Local IspellDict: "
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1298 "The keyword for a local dictionary to use.
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1299 The keyword must be followed by a valid dictionary name, defined in
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1300 `ispell-local-dictionary-alist' or `ispell-dictionary-alist'.
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1301 When multiple occurrences exist, the last keyword
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1302 definition is used.")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1303
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1304 (defconst ispell-pdict-keyword "Local IspellPersDict: "
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1305 "The keyword for defining buffer local dictionaries.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1306 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
1307 The last occurring definition in the buffer will be used.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1308
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1309 (defconst ispell-parsing-keyword "Local IspellParsing: "
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1310 "The keyword for overriding default Ispell parsing.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1311 The above keyword string should be followed by `latex-mode' or
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1312 `nroff-mode' to put the current buffer into the desired parsing mode.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1313
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1314 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
1315 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
1316 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
1317
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1318 ;;;###autoload
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1319 (defvar ispell-skip-region-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1320 '((ispell-words-keyword forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1321 (ispell-dictionary-keyword forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1322 (ispell-pdict-keyword forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1323 (ispell-parsing-keyword forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1324 ("^---*BEGIN PGP [A-Z ]*--*" . "^---*END PGP [A-Z ]*--*")
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1325 ;; assume multiline uuencoded file? "\nM.*$"?
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1326 ("^begin [0-9][0-9][0-9] [^ \t]+$" . "\nend\n")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1327 ("^%!PS-Adobe-[123].0" . "\n%%EOF\n")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1328 ("^---* \\(Start of \\)?[Ff]orwarded [Mm]essage"
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1329 . "^---* End of [Ff]orwarded [Mm]essage")
69556
b4d58e857930 (ispell-skip-region-alist): Add "_+" to the part that matches email addresses,
Eli Zaretskii <eliz@gnu.org>
parents: 69395
diff changeset
1330 ;; Matches e-mail addresses, file names, http addresses, etc. The
b4d58e857930 (ispell-skip-region-alist): Add "_+" to the part that matches email addresses,
Eli Zaretskii <eliz@gnu.org>
parents: 69395
diff changeset
1331 ;; `-+' `_+' patterns are necessary for performance reasons when
b4d58e857930 (ispell-skip-region-alist): Add "_+" to the part that matches email addresses,
Eli Zaretskii <eliz@gnu.org>
parents: 69395
diff changeset
1332 ;; `-' or `_' part of word syntax.
b4d58e857930 (ispell-skip-region-alist): Add "_+" to the part that matches email addresses,
Eli Zaretskii <eliz@gnu.org>
parents: 69395
diff changeset
1333 ("\\(--+\\|_+\\|\\(/\\w\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)")
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1334 ;; above checks /.\w sequences
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1335 ;;("\\(--+\\|\\(/\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)")
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1336 ;; This is a pretty complex regexp. It can be simplified to the following:
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1337 ;; "\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+"
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
1338 ;; 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
1339 ;; 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
1340 ;; 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
1341 ;; identification of the computer name, e.g.:
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1342 ;; "\\(\\w\\|[-_]\\)+[.:@]\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+"
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1343 )
22529
d9eac134a41b Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22526
diff changeset
1344 "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
1345 The alist key must be a regular expression.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1346 Valid forms include:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1347 (KEY) - just skip the key.
22529
d9eac134a41b Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22526
diff changeset
1348 (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
1349 (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
1350 (KEY FUNCTION ARGS) - FUNCTION called with ARGS returns end of region.")
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
1351 (put 'ispell-skip-region-alist 'risky-local-variable t)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1352
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1353
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1354 ;;;###autoload
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1355 (defvar ispell-tex-skip-alists
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
1356 '((;;("%\\[" . "%\\]") ; AMStex block comment...
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1357 ;; 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
1358 ;; \cite, \hspace, \hspace*, \hyphenation, \include, \includeonly, \input,
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1359 ;; \label, \nocite, \rule (in ispell - rest included here)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1360 ("\\\\addcontentsline" ispell-tex-arg-end 2)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1361 ("\\\\add\\(tocontents\\|vspace\\)" ispell-tex-arg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1362 ("\\\\\\([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
1363 ;;("\\\\author" ispell-tex-arg-end)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1364 ("\\\\bibliographystyle" ispell-tex-arg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1365 ("\\\\makebox" ispell-tex-arg-end 0)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1366 ("\\\\e?psfig" ispell-tex-arg-end)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1367 ("\\\\document\\(class\\|style\\)" .
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1368 "\\\\begin[ \t\n]*{[ \t\n]*document[ \t\n]*}"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1369 (;; delimited with \begin. In ispell: displaymath, eqnarray, eqnarray*,
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1370 ;; equation, minipage, picture, tabular, tabular* (ispell)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1371 ("\\(figure\\|table\\)\\*?" ispell-tex-arg-end 0)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1372 ("list" ispell-tex-arg-end 2)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1373 ("program" . "\\\\end[ \t\n]*{[ \t\n]*program[ \t\n]*}")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1374 ("verbatim\\*?" . "\\\\end[ \t\n]*{[ \t\n]*verbatim\\*?[ \t\n]*}")))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1375 "*Lists of regions to be skipped in TeX mode.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1376 First list is used raw.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1377 Second list has key placed inside \\begin{}.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1378
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1379 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
1380 for skipping in latex mode.")
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
1381 (put 'ispell-tex-skip-alist 'risky-local-variable t)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1382
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1383
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1384 ;;;###autoload
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1385 (defvar ispell-html-skip-alists
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1386 '(("<[cC][oO][dD][eE]\\>[^>]*>" "</[cC][oO][dD][eE]*>")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1387 ("<[sS][cC][rR][iI][pP][tT]\\>[^>]*>" "</[sS][cC][rR][iI][pP][tT]>")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1388 ("<[aA][pP][pP][lL][eE][tT]\\>[^>]*>" "</[aA][pP][pP][lL][eE][tT]>")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1389 ("<[vV][eE][rR][bB]\\>[^>]*>" "<[vV][eE][rR][bB]\\>[^>]*>")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1390 ;;("<[tT][tT]\\>[^>]*>" "<[tT][tT]\\>[^>]*>")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1391 ("<[tT][tT]/" "/")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1392 ("<[^ \t\n>]" ">")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1393 ("&[^ \t\n;]" "[; \t\n]"))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1394 "*Lists of start and end keys to skip in HTML buffers.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1395 Same format as `ispell-skip-region-alist'
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1396 Note - substrings of other matches must come last
56875
db0f95a55fd4 (ispell-html-skip-alists): Fix backslashes in docstring.
Juri Linkov <juri@jurta.org>
parents: 55623
diff changeset
1397 (e.g. \"<[tT][tT]/\" and \"<[^ \\t\\n>]\").")
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
1398 (put 'ispell-html-skip-alists 'risky-local-variable t)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1399
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1400 (defvar ispell-local-pdict ispell-personal-dictionary
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1401 "A buffer local variable containing the current personal dictionary.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1402 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
1403
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1404 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
1405 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
1406 to calling \\[ispell-change-dictionary]. This variable is automatically
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1407 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
1408 local variable syntax.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1409
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1410 (make-variable-buffer-local 'ispell-local-pdict)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1411
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1412 (defvar ispell-buffer-local-name nil
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1413 "Contains the buffer name if local word definitions were used.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1414 Ispell is then restarted because the local words could conflict.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1415
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1416 (defvar ispell-parser 'use-mode-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1417 "*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
1418 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
1419 Default parser is `nroff'.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1420 Currently the only other valid parser is `tex'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1421
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1422 You can set this variable in hooks in your init file -- eg:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1423
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
1424 \(add-hook 'tex-mode-hook (lambda () (setq ispell-parser 'tex)))")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1425
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1426 (defvar ispell-region-end (make-marker)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1427 "Marker that allows spelling continuations.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1428
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
1429 (defvar ispell-check-only nil
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
1430 "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
1431
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1432
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
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1436
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1437
52103
1ffb07fde6de Don't redo key bindings on loading, put them only in loaddefs.el.
Andreas Schwab <schwab@suse.de>
parents: 51151
diff changeset
1438 ;;;###autoload (define-key esc-map "$" 'ispell-word)
6839
7cd9ecd593d7 Bind M-$.
Richard M. Stallman <rms@gnu.org>
parents: 6646
diff changeset
1439
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1440
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1441 (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
1442 "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
1443 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
1444 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
1445 (if ispell-async-processp
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1446 (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
1447 (if (null ispell-process)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1448 (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
1449 (let ((buf ispell-output-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1450 ispell-output)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1451 (if (not (bufferp buf))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1452 (setq ispell-filter nil)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1453 (save-excursion
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1454 (set-buffer buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1455 (setq ispell-output (buffer-substring-no-properties
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1456 (point-min) (point-max))))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1457 (ispell-filter t ispell-output)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1458 (save-excursion
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1459 (set-buffer buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1460 (erase-buffer)))))))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1461
56932
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1462 (defun ispell-send-replacement (misspelled replacement)
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1463 "Notify aspell that MISSPELLED should be spelled REPLACEMENT.
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1464 This allows it to improve the suggestion list based on actual mispellings."
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1465 (and ispell-really-aspell
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1466 (ispell-send-string (concat "$$ra " misspelled "," replacement "\n"))))
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1467
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1468
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1469 (defun ispell-send-string (string)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1470 "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
1471 (if ispell-async-processp
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1472 (process-send-string ispell-process string)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1473 ;; 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
1474 ;; 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
1475 ;; 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
1476 ;; 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
1477 ;; 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
1478 (let ((cmd (aref string 0))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1479 ;; The following commands are not passed to Ispell until
49085
18b672f173d2 (lookup-words): Cope with null lookup-dict.
Dave Love <fx@gnu.org>
parents: 48622
diff changeset
1480 ;; we have a *real* reason to invoke it.
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1481 (cmds-to-defer '(?* ?@ ?~ ?+ ?- ?! ?%))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1482 (default-major-mode 'fundamental-mode)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1483 (session-buf ispell-session-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1484 (output-buf ispell-output-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1485 (ispell-args ispell-cmd-args)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1486 (defdir ispell-process-directory)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1487 prev-pos)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1488 (save-excursion
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1489 (set-buffer session-buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1490 (setq prev-pos (point))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1491 (setq default-directory defdir)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1492 (insert string)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1493 (if (not (memq cmd cmds-to-defer))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1494 (let (coding-system-for-read coding-system-for-write status)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1495 (if (and (boundp 'enable-multibyte-characters)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1496 enable-multibyte-characters)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1497 (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
1498 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
1499 (set-buffer output-buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1500 (erase-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1501 (set-buffer session-buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1502 (setq status
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1503 (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
1504 ispell-program-name nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1505 output-buf nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1506 "-a" "-m" ispell-args))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1507 (set-buffer output-buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1508 (goto-char (point-min))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1509 (save-match-data
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1510 (if (not (looking-at "@(#) "))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1511 (error "Ispell error: %s"
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1512 (buffer-substring-no-properties
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1513 (point) (progn (end-of-line) (point)))))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1514 ;; 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
1515 ;; 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
1516 ;; 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
1517 ;; `ispell-filter'.
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1518 (or (string= string "\032\n")
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1519 (progn
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1520 (forward-line)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1521 (delete-region (point-min) (point))))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1522 ;; 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
1523 ;; 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
1524 ;; 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
1525 ;; 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
1526 ;; the personal dictionary.
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1527 (set-buffer session-buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1528 (delete-region prev-pos (point))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1529 ;; Ispell run synchronously saves the personal dictionary
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1530 ;; 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
1531 ;; 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
1532 ;; dictionary.
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1533 (if (memq status '(0 nil))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1534 (let ((more-lines t))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1535 (goto-char (point-min))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1536 (while more-lines
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1537 (if (looking-at "^\\*")
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1538 (let ((start (point)))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1539 (forward-line)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1540 (delete-region start (point)))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1541 (setq more-lines (= 0 (forward-line))))))))))))))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1542
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1543
60530
32fd45514893 (ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents: 60284
diff changeset
1544 ;; Insert WORD while translating Latin characters to the equivalent
32fd45514893 (ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents: 60284
diff changeset
1545 ;; characters that is supported by buffer-file-coding-system.
32fd45514893 (ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents: 60284
diff changeset
1546
32fd45514893 (ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents: 60284
diff changeset
1547 (defun ispell-insert-word (word)
32fd45514893 (ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents: 60284
diff changeset
1548 (let ((pos (point)))
32fd45514893 (ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents: 60284
diff changeset
1549 (insert word)
32fd45514893 (ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents: 60284
diff changeset
1550 (if (char-table-p translation-table-for-input)
32fd45514893 (ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents: 60284
diff changeset
1551 (translate-region pos (point) translation-table-for-input))))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1552
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1553 ;;;###autoload
7585
64976da3fb8a (ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents: 7014
diff changeset
1554 (defun ispell-word (&optional following quietly continue)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1555 "Check spelling of word under or before the cursor.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1556 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
1557 in a window allowing you to choose one.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1558
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1559 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
1560 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
1561 \(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
1562 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
1563 when called interactively, non-corrective messages are suppressed.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1564
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1565 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
1566 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
1567
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1568 Word syntax is controlled by the definition of the chosen dictionary,
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1569 which is in `ispell-local-dictionary-alist' or `ispell-dictionary-alist'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1570
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1571 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
1572 or \\[ispell-region] to update the Ispell process.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1573
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1574 return values:
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1575 nil word is correct or spelling is accepted.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1576 0 word is inserted into buffer-local definitions.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1577 \"word\" word corrected from word list.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1578 \(\"word\" arg\) word is hand entered.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1579 quit spell session exited."
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1580
57937
d4af4d8d512b (ispell-word): Don't alter args; set them only thru `interactive' spec.
Richard M. Stallman <rms@gnu.org>
parents: 57516
diff changeset
1581 (interactive (list ispell-following-word ispell-quietly current-prefix-arg))
7585
64976da3fb8a (ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents: 7014
diff changeset
1582 (if continue
64976da3fb8a (ispell-word): Implement C-u $ as in ispell4.el.
Richard M. Stallman <rms@gnu.org>
parents: 7014
diff changeset
1583 (ispell-continue)
65834
153b746cc2d0 (ispell-word, ispell-region): Call ispell-maybe-find-aspell-dictionaries.
Richard M. Stallman <rms@gnu.org>
parents: 65803
diff changeset
1584 (ispell-maybe-find-aspell-dictionaries)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1585 (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
1586 (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
1587 (word (ispell-get-word following))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1588 start end poss new-word replace)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1589 ;; De-structure return word info list.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1590 (setq start (car (cdr word))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1591 end (car (cdr (cdr word)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1592 word (car word))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1593
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1594 ;; At this point it used to ignore 2-letter words.
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1595 ;; But that is silly; if the user asks for it, we should do it. - rms.
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1596 (or quietly
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1597 (message "Checking spelling of %s..."
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1598 (funcall ispell-format-word word)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1599 (ispell-send-string "%\n") ; put in verbose mode
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1600 (ispell-send-string (concat "^" word "\n"))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1601 ;; wait until ispell has processed word
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1602 (while (progn
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1603 (ispell-accept-output)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1604 (not (string= "" (car ispell-filter)))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1605 ;;(ispell-send-string "!\n") ;back to terse mode.
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1606 (setq ispell-filter (cdr ispell-filter)) ; remove extra \n
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1607 (if (and ispell-filter (listp ispell-filter))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1608 (if (> (length ispell-filter) 1)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1609 (error "Ispell and its process have different character maps")
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1610 (setq poss (ispell-parse-output (car ispell-filter)))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1611 (cond ((eq poss t)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1612 (or quietly
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1613 (message "%s is correct"
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1614 (funcall ispell-format-word word)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1615 (and (fboundp 'extent-at)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1616 (extent-at start)
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1617 (and (fboundp 'delete-extent)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1618 (delete-extent (extent-at start)))))
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1619 ((stringp poss)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1620 (or quietly
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1621 (message "%s is correct because of root %s"
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1622 (funcall ispell-format-word word)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1623 (funcall ispell-format-word poss)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1624 (and (fboundp 'extent-at)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1625 (extent-at start)
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1626 (and (fboundp 'delete-extent)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1627 (delete-extent (extent-at start)))))
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1628 ((null poss) (message "Error in ispell process"))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1629 (ispell-check-only ; called from ispell minor mode.
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1630 (if (fboundp 'make-extent)
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1631 (if (fboundp 'set-extent-property)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1632 (let ((ext (make-extent start end)))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1633 (set-extent-property ext 'face ispell-highlight-face)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1634 (set-extent-property ext 'priority 2000)))
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1635 (beep)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1636 (message "%s is incorrect"(funcall ispell-format-word word))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1637 (t ; prompt for correct word.
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1638 (save-window-excursion
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1639 (setq replace (ispell-command-loop
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1640 (car (cdr (cdr poss)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1641 (car (cdr (cdr (cdr poss))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1642 (car poss) start end)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1643 (cond ((equal 0 replace)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1644 (ispell-add-per-file-word-list (car poss)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1645 (replace
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1646 (setq new-word (if (atom replace) replace (car replace))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1647 cursor-location (+ (- (length word) (- end start))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1648 cursor-location))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1649 (if (not (equal new-word (car poss)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1650 (progn
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1651 (delete-region start end)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1652 (setq start (point))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1653 (ispell-insert-word new-word)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1654 (setq end (point))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1655 (if (not (atom replace)) ;recheck spelling of replacement
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1656 (progn
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1657 (if (car (cdr replace)) ; query replace requested
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1658 (save-window-excursion
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1659 (query-replace word new-word t)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1660 (goto-char start)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1661 ;; single word could be split into multiple words
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1662 (setq ispell-quit (not (ispell-region start end)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1663 ))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1664 ;; keep if rechecking word and we keep choices win.
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1665 (if (get-buffer ispell-choices-buffer)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1666 (kill-buffer ispell-choices-buffer))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1667 (ispell-pdict-save ispell-silently-savep)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1668 ;; NB: Cancels ispell-quit incorrectly if called from ispell-region
63822
8f7b5af86a5d (ispell-word): Remove stray parenthesis.
Luc Teirlinck <teirllm@auburn.edu>
parents: 63816
diff changeset
1669 (if ispell-quit (setq ispell-quit nil replace 'quit))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1670 (goto-char cursor-location) ; return to original location
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1671 replace)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1672
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1673
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1674 (defun ispell-get-word (following &optional extra-otherchars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1675 "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
1676 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
1677 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
1678 \(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
1679 Optional second argument contains otherchars that can be included in word
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1680 many times.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1681
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1682 Word syntax is controlled by the definition of the chosen dictionary,
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1683 which is in `ispell-local-dictionary-alist' or `ispell-dictionary-alist'."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1684 (let* ((ispell-casechars (ispell-get-casechars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1685 (ispell-not-casechars (ispell-get-not-casechars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1686 (ispell-otherchars (ispell-get-otherchars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1687 (ispell-many-otherchars-p (ispell-get-many-otherchars-p))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1688 (word-regexp (concat ispell-casechars
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1689 "+\\("
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1690 (if (not (string= "" ispell-otherchars))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1691 (concat ispell-otherchars "?"))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1692 (if extra-otherchars
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1693 (concat extra-otherchars "?"))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1694 ispell-casechars
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1695 "+\\)"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1696 (if (or ispell-many-otherchars-p
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1697 extra-otherchars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1698 "*" "?")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1699 did-it-once prevpt
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1700 start end word)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1701 ;; find the word
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1702 (if (not (looking-at ispell-casechars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1703 (if following
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1704 (re-search-forward ispell-casechars (point-max) t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1705 (re-search-backward ispell-casechars (point-min) t)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1706 ;; move to front of word
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1707 (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
1708 (while (and (or (and (not (string= "" ispell-otherchars))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1709 (looking-at ispell-otherchars))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1710 (and extra-otherchars (looking-at extra-otherchars)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1711 (not (bobp))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1712 (or (not did-it-once)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1713 ispell-many-otherchars-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1714 (not (eq prevpt (point))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1715 (if (and extra-otherchars (looking-at extra-otherchars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1716 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1717 (backward-char 1)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1718 (if (looking-at ispell-casechars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1719 (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
1720 (setq did-it-once t
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1721 prevpt (point))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1722 (backward-char 1)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1723 (if (looking-at ispell-casechars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1724 (re-search-backward ispell-not-casechars (point-min) 'move)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1725 (backward-char -1))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1726 ;; 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
1727 (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
1728 (if ispell-check-only
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1729 ;; 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
1730 (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
1731 (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
1732 (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
1733 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
1734 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
1735 (list word start end))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1736
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1737
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1738 ;;; Global ispell-pdict-modified-p is set by ispell-command-loop and
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1739 ;;; tracks changes in the dictionary. The global may either be
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1740 ;;; 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
1741 ;;; dictionary needs to be saved.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1742
37426
71d360920aad Fix autoload cookies.
Gerd Moellmann <gerd@gnu.org>
parents: 37007
diff changeset
1743 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1744 (defun ispell-pdict-save (&optional no-query force-save)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1745 "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
1746 If so, ask if it needs to be saved."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1747 (interactive (list ispell-silently-savep t))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1748 (if (and ispell-pdict-modified-p (listp ispell-pdict-modified-p))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1749 (setq ispell-pdict-modified-p (car ispell-pdict-modified-p)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1750 (if (or ispell-pdict-modified-p force-save)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1751 (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
1752 (progn
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1753 (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
1754 (message "Personal dictionary saved."))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1755 ;; unassert variable, even if not saved to avoid questioning.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1756 (setq ispell-pdict-modified-p nil))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1757
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1758
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1759 (defun ispell-command-loop (miss guess word start end)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1760 "Display possible corrections from list MISS.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1761 GUESS lists possibly valid affix construction of WORD.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1762 Returns nil to keep word.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1763 Returns 0 to insert locally into buffer-local dictionary.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1764 Returns string for new chosen word.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1765 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
1766 Query-replace when list length is 2.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1767 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
1768 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
1769 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
1770 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
1771 used.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1772 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
1773 (let ((count ?0)
34579
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
1774 (line ispell-choices-win-default-height)
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
1775 ;; ensure 4 context lines.
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
1776 (max-lines (- (ispell-adjusted-window-height) 4))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1777 (choices miss)
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1778 (window-min-height (min window-min-height
34579
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
1779 ispell-choices-win-default-height))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1780 (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
1781 (dedicated (window-dedicated-p (selected-window)))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1782 (skipped 0)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1783 char num result textwin dedicated-win)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1784
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1785 ;; setup the *Choices* buffer with valid data.
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1786 (save-excursion
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1787 (set-buffer (get-buffer-create ispell-choices-buffer))
64196
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
1788 (setq mode-line-format
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
1789 (concat "-- %b -- word: " word
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
1790 " -- dict: " (or ispell-current-dictionary "default")
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
1791 " -- prog: " (file-name-nondirectory ispell-program-name)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1792 ;; XEmacs: no need for horizontal scrollbar in choices window
57516
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
1793 (with-no-warnings
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
1794 (and (fboundp 'set-specifier)
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
1795 (boundp 'horizontal-scrollbar-visible-p)
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
1796 (set-specifier horizontal-scrollbar-visible-p nil
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
1797 (cons (current-buffer) nil))))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1798 (erase-buffer)
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1799 (if guess
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1800 (progn
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1801 (insert "Affix rules generate and capitalize "
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1802 "this word as shown below:\n\t")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1803 (while guess
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1804 (if (> (+ 4 (current-column) (length (car guess)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1805 (window-width))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1806 (progn
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1807 (insert "\n\t")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1808 (setq line (1+ line))))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1809 (insert (car guess) " ")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1810 (setq guess (cdr guess)))
66667
212206034148 (ispell-command-loop): Change `i' description not to assume it
Richard M. Stallman <rms@gnu.org>
parents: 66556
diff changeset
1811 (insert "\nUse option `i' to accept this spelling and put it in your private dictionary.")
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1812 (setq line (+ line (if choices 3 2)))))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1813 (while (and choices
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1814 (< (if (> (+ 7 (current-column) (length (car choices))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1815 (if (> count ?~) 3 0))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1816 (window-width))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1817 (progn
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1818 (insert "\n")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1819 (setq line (1+ line)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1820 line)
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1821 max-lines))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1822 ;; 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
1823 ;; 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
1824 (while (memq count command-characters) ; skip command characters.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1825 (setq count (ispell-int-char (1+ count))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1826 skipped (1+ skipped)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1827 (insert "(" count ") " (car choices) " ")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1828 (setq choices (cdr choices)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1829 count (ispell-int-char (1+ count))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1830 (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
1831
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1832 ;; ensure word is visible
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1833 (if (not (pos-visible-in-window-p end))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1834 (sit-for 0))
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1835
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1836 ;; allow temporary split of dedicated windows...
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1837 (if dedicated
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1838 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1839 (setq dedicated-win (selected-window))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1840 (set-window-dedicated-p dedicated-win nil)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1841
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1842 ;; Display choices for misspelled word.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1843 (ispell-show-choices line end)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1844 (select-window (setq textwin (next-window)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1845
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1846 ;; highlight word, protecting current buffer status
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1847 (unwind-protect
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1848 (progn
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1849 (and ispell-highlight-p
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1850 (ispell-highlight-spelling-error start end t))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1851 ;; Loop until a valid choice is made.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1852 (while
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1853 (eq
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1854 t
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1855 (setq
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1856 result
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1857 (progn
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1858 (undo-boundary)
17143
df636f296adf (ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents: 16762
diff changeset
1859 (let (message-log-max)
df636f296adf (ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents: 16762
diff changeset
1860 (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
1861 "unchanged, Character to replace word")))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1862 (let ((inhibit-quit t))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1863 (setq char (if (fboundp 'read-char-exclusive)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1864 (read-char-exclusive)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1865 (read-char))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1866 skipped 0)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1867 (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
1868 (setq char ?X
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1869 quit-flag nil)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1870 ;; Adjust num to array offset skipping command characters.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1871 (let ((com-chars command-characters))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1872 (while com-chars
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1873 (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
1874 (setq skipped (1+ skipped)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1875 (setq com-chars (cdr com-chars)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1876 (setq num (- char ?0 skipped)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1877
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1878 (cond
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1879 ((= char ? ) nil) ; accept word this time only
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1880 ((= 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
1881 (ispell-send-string (concat "*" word "\n"))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1882 (setq ispell-pdict-modified-p '(t)) ; dictionary modified!
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1883 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1884 ((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
1885 (ispell-send-string (concat "@" word "\n"))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1886 (if (null ispell-pdict-modified-p)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1887 (setq ispell-pdict-modified-p
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1888 (list ispell-pdict-modified-p)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1889 (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
1890 ((or (= char ?r) (= char ?R)) ; type in replacement
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1891 (and (eq 'block ispell-highlight-p) ; refresh tty's
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1892 (ispell-highlight-spelling-error start end nil t))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1893 (let ((result
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1894 (if (or (= char ?R) ispell-query-replace-choices)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1895 (list (read-string
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1896 (format "Query-replacement for %s: "word)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1897 word)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1898 t)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1899 (cons (read-string "Replacement for: " word)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1900 nil))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1901 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1902 (ispell-highlight-spelling-error start end nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1903 'block))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1904 result))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1905 ((or (= char ??) (= char help-char) (= char ?\C-h))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1906 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1907 (ispell-highlight-spelling-error start end nil t))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1908 (ispell-help)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1909 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1910 (ispell-highlight-spelling-error start end nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1911 'block))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1912 t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1913 ;; Quit and move point back.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1914 ((= char ?x)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1915 (ispell-pdict-save ispell-silently-savep)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1916 (message "Exited spell-checking")
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1917 (setq ispell-quit t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1918 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1919 ;; Quit and preserve point.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1920 ((= char ?X)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1921 (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
1922 (message "%s"
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1923 (substitute-command-keys
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1924 (concat "Spell-checking suspended;"
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1925 " use C-u \\[ispell-word] to resume")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1926 (setq ispell-quit start)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1927 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1928 ((= char ?q)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1929 (if (y-or-n-p "Really kill Ispell process? ")
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1930 (progn
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1931 (ispell-kill-ispell t) ; terminate process.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1932 (setq ispell-quit (or (not ispell-checking-message)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1933 (point))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1934 ispell-pdict-modified-p nil))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1935 t)) ; continue if they don't quit.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1936 ((= char ?l)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1937 (and (eq 'block ispell-highlight-p) ; refresh tty displays
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1938 (ispell-highlight-spelling-error start end nil t))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1939 (let ((new-word (read-string
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1940 "Lookup string (`*' is wildcard): "
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1941 word)))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1942 (if new-word
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1943 (progn
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1944 (save-excursion
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1945 (set-buffer (get-buffer-create
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1946 ispell-choices-buffer))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1947 (erase-buffer)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1948 (setq count ?0
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1949 skipped 0
64196
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
1950 mode-line-format
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
1951 (concat "-- %b -- word: " new-word
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
1952 " -- dict: "
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
1953 ispell-alternate-dictionary)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1954 miss (lookup-words new-word)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1955 choices miss
34579
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
1956 line ispell-choices-win-default-height)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1957 (while (and choices ; adjust choices window.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1958 (< (if (> (+ 7 (current-column)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1959 (length (car choices))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1960 (if (> count ?~) 3 0))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1961 (window-width))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1962 (progn
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1963 (insert "\n")
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1964 (setq line (1+ line)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1965 line)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1966 max-lines))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1967 (while (memq count command-characters)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1968 (setq count (ispell-int-char (1+ count))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1969 skipped (1+ skipped)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1970 (insert "(" count ") " (car choices) " ")
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1971 (setq choices (cdr choices)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1972 count (ispell-int-char (1+ count))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1973 (setq count (ispell-int-char
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1974 (- count ?0 skipped))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1975 (ispell-show-choices line end)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1976 (select-window (next-window)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1977 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1978 (ispell-highlight-spelling-error start end nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1979 'block))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1980 t) ; reselect from new choices
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
1981 ((= char ?u) ; insert lowercase into dictionary
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1982 (ispell-send-string (concat "*" (downcase word) "\n"))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1983 (setq ispell-pdict-modified-p '(t)) ; dictionary modified!
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1984 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1985 ((= 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
1986 (ispell-send-string
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1987 (concat "*" (read-string "Insert: " word) "\n"))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1988 (setq ispell-pdict-modified-p '(t))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1989 (cons word nil))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1990 ((and (>= num 0) (< num count))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1991 (if ispell-query-replace-choices ; Query replace flag
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1992 (list (nth num miss) 'query-replace)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1993 (nth num miss)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1994 ((= char ?\C-l)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1995 (redraw-display) t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1996 ((= char ?\C-r)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1997 ;; 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
1998 (if (marker-position ispell-recursive-edit-marker)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1999 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2000 (message "Only one recursive edit session supported")
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2001 (beep)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2002 (sit-for 2))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2003 (set-marker ispell-recursive-edit-marker start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2004 ;;(set-marker ispell-region-end reg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2005 (and ispell-highlight-p ; unhighlight
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2006 (ispell-highlight-spelling-error start end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2007 (unwind-protect
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2008 (progn
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2009 (message
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2010 "%s"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2011 (substitute-command-keys
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2012 (concat "Exit recursive edit with"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2013 " \\[exit-recursive-edit]")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2014 (save-window-excursion (save-excursion
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2015 (recursive-edit))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2016 ;; protected
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2017 (goto-char ispell-recursive-edit-marker)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2018 (if (not (equal (marker-buffer
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2019 ispell-recursive-edit-marker)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2020 (current-buffer)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2021 (progn
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2022 (set-marker ispell-recursive-edit-marker nil)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2023 (error
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2024 "Cannot continue ispell from this buffer.")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2025 (set-marker ispell-recursive-edit-marker nil)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2026 (list word nil)) ; recheck starting at this word.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2027 ((= char ?\C-z)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2028 (funcall (key-binding "\C-z"))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2029 t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2030 (t (ding) t))))))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2031 result)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2032 ;; protected
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2033 (and ispell-highlight-p ; unhighlight
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2034 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2035 (select-window textwin)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2036 (ispell-highlight-spelling-error start end)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2037 (if dedicated
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2038 (set-window-dedicated-p dedicated-win t)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2039
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2040
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2041
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2042 (defun ispell-show-choices (line end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2043 "Shows the choices in another buffer or frame."
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2044 (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
2045 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2046 (framepop-display-buffer (get-buffer ispell-choices-buffer))
57516
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
2047 ;;; (get-buffer-window ispell-choices-buffer t)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2048 (select-window (previous-window))) ; *Choices* window
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2049 ;; 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
2050 (let ((choices-window (get-buffer-window ispell-choices-buffer)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2051 (if choices-window
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2052 (if (= line (ispell-adjusted-window-height choices-window))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2053 (select-window choices-window)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2054 ;; *Choices* window changed size. Adjust the choices window
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2055 ;; without scrolling the spelled window when possible
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2056 (let ((window-line
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2057 (- line (ispell-adjusted-window-height choices-window)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2058 (visible (progn (vertical-motion -1) (point))))
34579
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
2059 (if (< line ispell-choices-win-default-height)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2060 (setq window-line (+ window-line
34579
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
2061 (- ispell-choices-win-default-height
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2062 line))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2063 (move-to-window-line 0)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2064 (vertical-motion window-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2065 (set-window-start (selected-window)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2066 (if (> (point) visible) visible (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2067 (goto-char end)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2068 (select-window choices-window)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2069 (enlarge-window window-line)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2070 ;; Overlay *Choices* window when it isn't showing
34579
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
2071 (ispell-overlay-window (max line ispell-choices-win-default-height)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2072 (switch-to-buffer ispell-choices-buffer)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2073 (goto-char (point-min)))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2074
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2075
6288
3197bf3cc0a1 (ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents: 6285
diff changeset
2076 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2077 (defun ispell-help ()
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2078 "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
2079
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2080 Selections are:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2081
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2082 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
2083 SPC: Accept word this time.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2084 `i': Accept word and insert into private dictionary.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2085 `a': Accept word for this session.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2086 `A': Accept word and place in `buffer-local dictionary'.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2087 `r': Replace word with typed-in value. Rechecked.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2088 `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
2089 `?': Show these commands.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2090 `x': Exit spelling buffer. Move cursor to original point.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2091 `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
2092 the aborted check to be completed later.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2093 `q': Quit spelling session (Kills ispell process).
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2094 `l': Look up typed-in replacement in alternate dictionary. Wildcards okay.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2095 `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
2096 `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
2097 `C-l': redraws screen
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2098 `C-r': recursive edit
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2099 `C-z': suspend emacs or iconify frame"
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2100
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2101 (if (equal ispell-help-in-bufferp 'electric)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2102 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2103 (require 'ehelp)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
2104 (with-electric-help
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2105 (function (lambda ()
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2106 ;;This shouldn't be necessary: with-electric-help needs
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2107 ;; an optional argument telling it about the smallest
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2108 ;; acceptable window-height of the help buffer.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2109 ;;(if (< (window-height) 15)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2110 ;; (enlarge-window
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2111 ;; (- 15 (ispell-adjusted-window-height))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2112 (princ "Selections are:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2113
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2114 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
2115 SPC: Accept word this time.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2116 `i': Accept word and insert into private dictionary.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2117 `a': Accept word for this session.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2118 `A': Accept word and place in `buffer-local dictionary'.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2119 `r': Replace word with typed-in value. Rechecked.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2120 `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
2121 `?': Show these commands.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2122 `x': Exit spelling buffer. Move cursor to original point.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2123 `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
2124 the aborted check to be completed later.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2125 `q': Quit spelling session (Kills ispell process).
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2126 `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
2127 `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
2128 `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
2129 `C-l': redraws screen
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2130 `C-r': recursive edit
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2131 `C-z': suspend emacs or iconify frame")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2132 nil ;undocumented requirement of with-electric-help
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2133 ))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2134
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2135
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2136 (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
2137 "[i]nsert into private dictionary"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2138 (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
2139 "e[x/X]it; [q]uit session"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2140 (help-3 (concat "[u]ncapitalized insert into dict. "
54487
3bb6f178572c (ispell-help): Doc fix.
Juri Linkov <juri@jurta.org>
parents: 52401
diff changeset
2141 "Type 'x C-h f ispell-help' for more help")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2142 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2143 (if ispell-help-in-bufferp
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2144 (progn
34579
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
2145 (ispell-overlay-window 4)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2146 (switch-to-buffer (get-buffer-create "*Ispell Help*"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2147 (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
2148 (sit-for 5)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2149 (kill-buffer "*Ispell Help*"))
42889
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2150 (unwind-protect
59064
c674f42f1748 (ispell-help): Bind resize-mini-windows.
Richard M. Stallman <rms@gnu.org>
parents: 58494
diff changeset
2151 (let ((resize-mini-windows 'grow-only))
42889
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2152 (select-window (minibuffer-window))
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2153 (erase-buffer)
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2154 (message nil)
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2155 ;;(set-minibuffer-window (selected-window))
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2156 (enlarge-window 2)
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2157 (insert (concat help-1 "\n" help-2 "\n" help-3))
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2158 (sit-for 5))
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2159 (erase-buffer)))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2160
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2161
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2162 (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
2163 "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
2164 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
2165 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
2166 search for the words (usually egrep).
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2167
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2168 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
2169 `ispell-alternate-dictionary'."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2170 ;; 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
2171 ;; 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
2172 (if (null lookup-dict)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2173 (setq lookup-dict ispell-alternate-dictionary))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2174
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2175 (let* ((process-connection-type ispell-use-ptys-p)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2176 (wild-p (string-match "\\*" word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2177 (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
2178 (or ispell-have-new-look (not wild-p))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2179 (ispell-grep-buffer (get-buffer-create "*Ispell-Temp*")) ; result buf
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2180 (prog (if look-p ispell-look-command ispell-grep-command))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2181 (args (if look-p ispell-look-options ispell-grep-options))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2182 status results loc)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2183 (unwind-protect
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2184 (save-window-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2185 (message "Starting \"%s\" process..." (file-name-nondirectory prog))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2186 (set-buffer ispell-grep-buffer)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2187 (if look-p
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2188 nil
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2189 ;; convert * to .*
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2190 (insert "^" word "$")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2191 (while (search-backward "*" nil t) (insert "."))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2192 (setq word (buffer-string))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2193 (erase-buffer))
64965
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2194 (setq status (apply 'call-process prog nil t nil
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2195 (nconc (if (and args (> (length args) 0))
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2196 (list args)
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2197 (if look-p nil
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2198 (list "-e")))
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2199 (list word)
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2200 (if lookup-dict (list lookup-dict)))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2201 ;; grep returns status 1 and no output when word not found, which
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2202 ;; is a perfectly normal thing.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2203 (if (stringp status)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2204 (setq results (cons (format "error: %s exited with signal %s"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2205 (file-name-nondirectory prog) status)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2206 results))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2207 ;; else collect words into `results' in FIFO order
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2208 (goto-char (point-max))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2209 ;; assure we've ended with \n
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2210 (or (bobp) (= (preceding-char) ?\n) (insert ?\n))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2211 (while (not (bobp))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2212 (setq loc (point))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2213 (forward-line -1)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2214 (setq results (cons (buffer-substring-no-properties (point)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2215 (1- loc))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2216 results)))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2217 ;; protected
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2218 (kill-buffer ispell-grep-buffer)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2219 (if (and results (string-match ".+: " (car results)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2220 (error "%s error: %s" ispell-grep-command (car results))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2221 results))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2222
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2223
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2224 ;;; "ispell-filter" is a list of output lines from the generating function.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2225 ;;; 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
2226 ;;; "output" can contain multiple lines, part of a line, or both.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2227 ;;; "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
2228 ;;; multiple lines.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2229 ;;; "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
2230 ;;; 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
2231 ;;; 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
2232 ;;; 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
2233 ;;; in this case treats the next input received as fresh input.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2234
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2235 (defun ispell-filter (process output)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2236 "Output filter function for ispell, grep, and look."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2237 (let ((start 0)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2238 (continue t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2239 end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2240 (while continue
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2241 (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
2242 ;; 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
2243 ;; are not continuing, treat the next item as a separate list. When
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2244 ;; ispell-filter-continue is asserted, ispell-filter *should* always be a
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2245 ;; list!
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2246
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2247 ;; Continue with same line (item)?
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2248 (if (and ispell-filter-continue ispell-filter (listp ispell-filter))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2249 ;; Yes. Add it to the prev item
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2250 (setcar ispell-filter
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2251 (concat (car ispell-filter) (substring output start end)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2252 ;; No. This is a new line and item.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2253 (setq ispell-filter
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2254 (cons (substring output start end) ispell-filter)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2255 (if (null end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2256 ;; We've completed reading the output, but didn't finish the line.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2257 (setq ispell-filter-continue t continue nil)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2258 ;; skip over newline, this line complete.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2259 (setq ispell-filter-continue nil end (1+ end))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2260 (if (= end (length output)) ; No more lines in output
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2261 (setq continue nil) ; so we can exit the filter.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2262 (setq start end)))))) ; else move start to next line of input
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2263
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2264
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2265 ;;; 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
2266 ;;; highlighted.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2267 (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
2268 refresh)
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2269 "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
2270 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
2271 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
2272 Uses block cursor to highlight one character.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2273 Optional REFRESH will unhighlighted then highlight, using block cursor
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2274 highlighting when REFRESH is equal to `block'."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2275 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2276 (or (eq 'block refresh)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2277 (setq start (1+ start)))) ; On block non-refresh, inc start.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2278 (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
2279 (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
2280 (text (buffer-substring-no-properties start end)) ; Save hilight region
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2281 (inhibit-quit t) ; inhibit interrupt processing here.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2282 (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
2283 (goto-char end)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2284 (delete-region start end)
14040
187735b53d52 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
2285 (insert-char ? (- end start)) ; minimize amount of redisplay
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2286 (sit-for 0) ; update display
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2287 (if highlight (setq inverse-video (not inverse-video))) ; toggle video
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2288 (delete-region start end) ; delete whitespace
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2289 (insert text) ; insert text in inverse video.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2290 (sit-for 0) ; update display showing inverse video.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2291 (if (not highlight)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2292 (goto-char end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2293 (setq inverse-video (not inverse-video)) ; toggle video
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2294 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2295 (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
2296 (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
2297 (and refresh ; re-highlight
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2298 (ispell-highlight-spelling-error-generic
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2299 (if (eq 'block refresh) start (- start 2)) end t))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2300
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2301
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2302 (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
2303 "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
2304 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
2305 otherwise it is displayed normally."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2306 (if highlight
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2307 (isearch-highlight start end)
60714
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2308 (isearch-dehighlight))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2309 ;;(sit-for 0)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2310 )
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2311
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2312
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2313 (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
2314 "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
2315 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
2316 otherwise it is displayed normally.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2317
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2318 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
2319 (if highlight
67427
055cc88a4fd0 (ispell-highlight-spelling-error-overlay):
Juri Linkov <juri@jurta.org>
parents: 66667
diff changeset
2320 (if ispell-overlay
055cc88a4fd0 (ispell-highlight-spelling-error-overlay):
Juri Linkov <juri@jurta.org>
parents: 66667
diff changeset
2321 (move-overlay ispell-overlay start end (current-buffer))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2322 (setq ispell-overlay (make-overlay start end))
67427
055cc88a4fd0 (ispell-highlight-spelling-error-overlay):
Juri Linkov <juri@jurta.org>
parents: 66667
diff changeset
2323 (overlay-put ispell-overlay 'priority 1001) ;higher than lazy overlays
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2324 (overlay-put ispell-overlay 'face ispell-highlight-face))
67427
055cc88a4fd0 (ispell-highlight-spelling-error-overlay):
Juri Linkov <juri@jurta.org>
parents: 66667
diff changeset
2325 (if ispell-overlay
055cc88a4fd0 (ispell-highlight-spelling-error-overlay):
Juri Linkov <juri@jurta.org>
parents: 66667
diff changeset
2326 (delete-overlay ispell-overlay)))
60714
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2327 (if (and ispell-lazy-highlight (boundp 'lazy-highlight-cleanup))
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2328 (if highlight
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2329 (let ((isearch-string
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2330 (concat
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2331 "\\b"
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2332 (regexp-quote (buffer-substring-no-properties start end))
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2333 "\\b"))
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2334 (isearch-regexp t)
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2335 (isearch-case-fold-search nil))
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2336 (isearch-lazy-highlight-new-loop
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2337 (if (boundp 'reg-start) reg-start)
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2338 (if (boundp 'reg-end) reg-end)))
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2339 (lazy-highlight-cleanup lazy-highlight-cleanup)
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2340 (setq isearch-lazy-highlight-last-string nil))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2341
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2342
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2343 (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
2344 (cond
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
2345 ((featurep 'xemacs)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2346 (ispell-highlight-spelling-error-xemacs start end highlight))
40412
acbdf8dbf6d4 (version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents: 39186
diff changeset
2347 ((and (featurep 'faces)
30546
26e5d26a83ed (ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents: 29208
diff changeset
2348 (or (and (fboundp 'display-color-p) (display-color-p))
26e5d26a83ed (ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents: 29208
diff changeset
2349 window-system))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2350 (ispell-highlight-spelling-error-overlay start end highlight))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2351 (t (ispell-highlight-spelling-error-generic start end highlight refresh))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2352
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2353 (defun ispell-adjusted-window-height (&optional window)
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2354 "Like `window-height', adjusted to correct for the effect of tall mode-lines.
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2355 The value returned is actually the nominal number of text-lines in the
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2356 window plus 1. On a terminal, this is the same value returned by
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2357 `window-height', but if the window has a mode-line is taller than a normal
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2358 text line, the returned value may be smaller than that from
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2359 `window-height'."
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2360 (cond ((fboundp 'window-text-height)
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2361 (1+ (window-text-height window)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2362 ((or (and (fboundp 'display-graphic-p) (display-graphic-p))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2363 (and (featurep 'xemacs) window-system))
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2364 (1- (window-height window)))
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2365 (t
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2366 (window-height window))))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2367
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2368 (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
2369 "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
2370 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
2371 scrolling the current window. Leave the new window selected."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2372 (save-excursion
34579
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
2373 (let ((oldot (save-excursion (vertical-motion -1) (point)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2374 (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
2375 ;; If line above old point (line starting at oldot) would be
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2376 ;; hidden by new window, scroll it to just below new win
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2377 ;; otherwise set top line of other win so it doesn't scroll.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2378 (if (< oldot top) (setq top oldot))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2379 ;; if frame is unsplitable, temporarily disable that...
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2380 (if (cdr (assq 'unsplittable (frame-parameters (selected-frame))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2381 (let ((frame (selected-frame)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2382 (modify-frame-parameters frame '((unsplittable . nil)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2383 (split-window nil height)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2384 (modify-frame-parameters frame '((unsplittable . t))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2385 (split-window nil height))
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2386 (let ((deficit (- height (ispell-adjusted-window-height))))
34579
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
2387 (when (> deficit 0)
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2388 ;; Number of lines the window is still too short. We ensure that
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2389 ;; there are at least (1- HEIGHT) lines visible in the window.
34579
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
2390 (enlarge-window deficit)
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
2391 (goto-char top)
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
2392 (vertical-motion deficit)
432f2f4182cd (ispell-overlay-window): Ensure that the new window is really the right size.
Miles Bader <miles@gnu.org>
parents: 34364
diff changeset
2393 (setq top (min (point) oldot))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2394 (set-window-start (next-window) top))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2395
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2396
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2397 ;;; Should we add a compound word match return value?
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2398 (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
2399 "Parse the OUTPUT string from Ispell process and return:
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2400 1: t for an exact match.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2401 2: A string containing the root word matched via suffix removal.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2402 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
2403 (\"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
2404 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
2405 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
2406 MISS-LIST and GUESS-LIST are possibly null lists of guesses and misses.
42206
0f4506820432 Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 41949
diff changeset
2407 4: nil when an error has occurred.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2408
37007
4caced3e865e (ispell-parse-output): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 36815
diff changeset
2409 Optional second arg ACCEPT-LIST is list of words already accepted.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2410 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
2411 (cond
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2412 ((string= output "") t) ; for startup with pipes...
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2413 ((string= output "*") t) ; exact match
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2414 ((string= output "-") t) ; compound word match
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
2415 ((eq (aref output 0) ?+) ; found because of root word
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2416 (substring output 2)) ; return root word
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2417 ((equal 0 (string-match "[\ra-zA-Z]" output))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2418 (ding) ; error message from ispell!
65583
703495630901 Message format spec fixes (2)
Deepak Goel <deego@gnufans.org>
parents: 65571
diff changeset
2419 (message "Ispell error: %s" output)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2420 (sit-for 5)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2421 nil)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2422 (t ; need to process &, ?, and #'s
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
2423 (let ((type (aref output 0)) ; &, ?, or #
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2424 (original-word (substring output 2 (string-match " " output 2)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2425 (cur-count 0) ; contains number of misses + guesses
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2426 count miss-list guess-list offset)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2427 (setq output (substring output (match-end 0))) ; skip over misspelling
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
2428 (if (eq type ?#)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2429 (setq count 0) ; no misses for type #
62402
a7e02ef1e3d6 Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents: 62156
diff changeset
2430 (setq count (string-to-number output) ; get number of misses.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2431 output (substring output (1+ (string-match " " output 1)))))
62402
a7e02ef1e3d6 Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents: 62156
diff changeset
2432 (setq offset (string-to-number output))
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
2433 (if (eq type ?#) ; No miss or guess list.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2434 (setq output nil)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2435 (setq output (substring output (1+ (string-match " " output 1)))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2436 (while output
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2437 (let ((end (string-match ", \\|\\($\\)" output))) ; end of miss/guess.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2438 (setq cur-count (1+ cur-count))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2439 (if (> cur-count count)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2440 (setq guess-list (cons (substring output 0 end) guess-list))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2441 (setq miss-list (cons (substring output 0 end) miss-list)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2442 (if (match-end 1) ; True only when at end of line.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2443 (setq output nil) ; no more misses or guesses
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2444 (setq output (substring output (+ end 2))))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2445 ;; return results. Accept word if it was already accepted.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2446 ;; adjust offset.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2447 (if (member original-word accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2448 t
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2449 (list original-word
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2450 (if (numberp shift) (+ shift offset) offset)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2451 (nreverse miss-list) (nreverse guess-list)))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2452
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2453
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2454 (defun ispell-process-status ()
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2455 "Return the status of the Ispell process.
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2456 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
2457 (if ispell-async-processp
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2458 (process-status ispell-process)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2459 (and ispell-process 'run)))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2460
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2461
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2462 (defun ispell-start-process ()
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2463 "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
2464 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
2465 (let (args)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2466 ;; Local dictionary becomes the global dictionary in use.
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2467 (setq ispell-current-dictionary
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2468 (or ispell-local-dictionary ispell-dictionary))
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2469 (setq ispell-current-personal-dictionary
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2470 (or ispell-local-pdict ispell-personal-dictionary))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2471 (setq args (ispell-get-ispell-args))
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2472 (if (and ispell-current-dictionary ; use specified dictionary
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2473 (not (member "-d" args))) ; only define if not overridden
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2474 (setq args
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2475 (append (list "-d" ispell-current-dictionary) args)))
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2476 (if ispell-current-personal-dictionary ; use specified pers dict
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2477 (setq args
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2478 (append args
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2479 (list "-p"
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2480 (expand-file-name ispell-current-personal-dictionary)))))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2481 (setq args (append args ispell-extra-args))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2482
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2483 ;; Initially we don't know any buffer's local words.
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2484 (setq ispell-buffer-local-name nil)
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2485
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2486 (if ispell-async-processp
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2487 (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
2488 (apply 'start-process
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2489 "ispell" nil ispell-program-name
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2490 "-a" ; accept single input lines
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2491 "-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
2492 args))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2493 (setq ispell-cmd-args args
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2494 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
2495 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
2496 (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
2497 t)))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2498
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2499
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2500
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2501 (defun ispell-init-process ()
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2502 "Check status of Ispell process and start if necessary."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2503 (if (and ispell-process
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2504 (eq (ispell-process-status) 'run)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
2505 ;; If we're using a personal dictionary, ensure
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2506 ;; we're in the same default directory!
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2507 (or (not ispell-personal-dictionary)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2508 (equal ispell-process-directory default-directory)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2509 (setq ispell-filter nil ispell-filter-continue nil)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2510 ;; may need to restart to select new personal dictionary.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2511 (ispell-kill-ispell t)
68169
c8f233733d78 (ispell-init-process): Include the used dictionary in ispell process
Eli Zaretskii <eliz@gnu.org>
parents: 67594
diff changeset
2512 (message "Starting new Ispell process [%s] ..."
c8f233733d78 (ispell-init-process): Include the used dictionary in ispell process
Eli Zaretskii <eliz@gnu.org>
parents: 67594
diff changeset
2513 (or ispell-local-dictionary ispell-dictionary "default"))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2514 (sit-for 0)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2515 (setq ispell-library-directory (ispell-check-version)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2516 ispell-process-directory default-directory
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2517 ispell-process (ispell-start-process)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2518 ispell-filter nil
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2519 ispell-filter-continue nil)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2520 (if ispell-async-processp
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2521 (set-process-filter ispell-process 'ispell-filter))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2522 ;; protect against bogus binding of `enable-multibyte-characters' in XEmacs
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
2523 (if (and (or (featurep 'xemacs)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2524 (and (boundp 'enable-multibyte-characters)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2525 enable-multibyte-characters))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2526 (fboundp 'set-process-coding-system))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2527 (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
2528 (ispell-get-coding-system)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2529 ;; Get version ID line
40412
acbdf8dbf6d4 (version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents: 39186
diff changeset
2530 (ispell-accept-output 3)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2531 ;; get more output if filter empty?
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2532 (if (null ispell-filter) (ispell-accept-output 3))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2533 (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
2534 (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
2535 ((and
11c4f543b742 (ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents: 11304
diff changeset
2536 (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
2537 (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
2538 (progn
40412
acbdf8dbf6d4 (version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents: 39186
diff changeset
2539 (ispell-accept-output 3) ; was warn msg.
11469
11c4f543b742 (ispell-init-ispell): Don't barf if there is a
Richard M. Stallman <rms@gnu.org>
parents: 11304
diff changeset
2540 (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
2541 (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
2542 (string-match "^@(#) " (car ispell-filter)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2543 ;; 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
2544 ;; version, so don't bother checking again.)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2545 nil)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2546 (t
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2547 ;; Otherwise, it must be an error message. Show the user.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2548 ;; 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
2549 ;; Otherwise we get cool errors like "Can't open ".
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2550 (sleep-for 1)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2551 (ispell-accept-output 3)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2552 (error "%s" (mapconcat 'identity ispell-filter "\n"))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2553 (setq ispell-filter nil) ; Discard version ID line
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2554 (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
2555 (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
2556 (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
2557 (if ispell-async-processp
57516
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
2558 (set-process-query-on-exit-flag ispell-process nil))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2559
6288
3197bf3cc0a1 (ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents: 6285
diff changeset
2560 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2561 (defun ispell-kill-ispell (&optional no-error)
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2562 "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
2563 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
2564 (interactive)
68195
bb2dfb332355 (ispell-kill-ispell): Run new hook ispell-kill-ispell-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68169
diff changeset
2565 ;; This hook is typically used by flyspell to flush some variables used
bb2dfb332355 (ispell-kill-ispell): Run new hook ispell-kill-ispell-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68169
diff changeset
2566 ;; to optimize the common cases.
bb2dfb332355 (ispell-kill-ispell): Run new hook ispell-kill-ispell-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68169
diff changeset
2567 (run-hooks 'ispell-kill-ispell-hook)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2568 (if (not (and ispell-process
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2569 (eq (ispell-process-status) 'run)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2570 (or no-error
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2571 (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
2572 (if ispell-async-processp
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2573 (progn
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2574 (process-send-eof ispell-process)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2575 (if (eq (ispell-process-status) 'run)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2576 (ispell-accept-output 1))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2577 (if (eq (ispell-process-status) 'run)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2578 (kill-process ispell-process))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2579 (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
2580 (eq (ispell-process-status) 'signal)))
40412
acbdf8dbf6d4 (version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents: 39186
diff changeset
2581 (sleep-for 0.25)))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2582 ;; synchronous processes
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2583 (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
2584 (kill-buffer ispell-output-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2585 (kill-buffer ispell-session-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2586 (setq ispell-output-buffer nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2587 ispell-session-buffer nil))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2588 (setq ispell-process nil)
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2589 (message "Ispell process killed")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2590 nil))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2591
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2592
12260
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
2593 ;;; 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
2594 ;;; 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
2595
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2596 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2597 (defun ispell-change-dictionary (dict &optional arg)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2598 "Change to dictionary DICT for Ispell.
60284
196128d3d9e8 (ispell-change-dictionary): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 60182
diff changeset
2599 With a prefix arg, set it \"globally\", for all buffers.
196128d3d9e8 (ispell-change-dictionary): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 60182
diff changeset
2600 Without a prefix arg, set it \"locally\", just for this buffer.
196128d3d9e8 (ispell-change-dictionary): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 60182
diff changeset
2601
196128d3d9e8 (ispell-change-dictionary): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 60182
diff changeset
2602 By just answering RET you can find out what the current dictionary is."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2603 (interactive
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2604 (list (completing-read
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2605 "Use new dictionary (RET for current, SPC to complete): "
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2606 (and (fboundp 'ispell-valid-dictionary-list)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2607 (mapcar 'list (ispell-valid-dictionary-list)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2608 nil t)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2609 current-prefix-arg))
70398
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2610 (unless arg (ispell-buffer-local-dict 'no-reload))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2611 (if (equal dict "default") (setq dict nil))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2612 ;; This relies on completing-read's bug of returning "" for no match
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2613 (cond ((equal dict "")
70398
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2614 (ispell-internal-change-dictionary)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2615 (message "Using %s dictionary"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2616 (or ispell-local-dictionary ispell-dictionary "default")))
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2617 ((equal dict (or ispell-local-dictionary
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2618 ispell-dictionary "default"))
70398
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2619 ;; Specified dictionary is the default already. Could reload
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2620 ;; the dictionaries if needed.
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2621 (ispell-internal-change-dictionary)
10697
d2fd1a6288b4 Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents: 10462
diff changeset
2622 (and (interactive-p)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2623 (message "No change, using %s dictionary" dict)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2624 (t ; reset dictionary!
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2625 (if (or (assoc dict ispell-local-dictionary-alist)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2626 (assoc dict ispell-dictionary-alist))
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2627 (if arg
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2628 ;; set default dictionary
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2629 (setq ispell-dictionary dict)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2630 ;; set local dictionary
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2631 (setq ispell-local-dictionary dict)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2632 (setq ispell-local-dictionary-overridden t))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2633 (error "Undefined dictionary: %s" dict))
68169
c8f233733d78 (ispell-init-process): Include the used dictionary in ispell process
Eli Zaretskii <eliz@gnu.org>
parents: 67594
diff changeset
2634 (ispell-internal-change-dictionary)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2635 (message "%s Ispell dictionary set to %s"
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2636 (if arg "Global" "Local")
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2637 dict))))
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2638
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2639 (defun ispell-internal-change-dictionary ()
70398
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2640 "Update the dictionary and the personal dictionary used by Ispell.
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2641 This may kill the Ispell process; if so,
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2642 a new one will be started when needed."
70398
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2643 (let ((dict (or ispell-local-dictionary ispell-dictionary))
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2644 (pdict (or ispell-local-pdict ispell-personal-dictionary)))
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2645 (unless (and (equal ispell-current-dictionary dict)
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2646 (equal ispell-current-personal-dictionary pdict))
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2647 (ispell-kill-ispell t)
70398
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2648 (setq ispell-current-dictionary dict
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
2649 ispell-current-personal-dictionary pdict))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2650
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2651 ;;; Spelling of comments are checked when ispell-check-comments is non-nil.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2652
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2653 ;;;###autoload
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2654 (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
2655 "Interactively check a region for spelling errors.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2656 Return nil if spell session is quit,
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2657 otherwise returns shift offset amount for last line processed."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2658 (interactive "r") ; Don't flag errors on read-only bufs.
65834
153b746cc2d0 (ispell-word, ispell-region): Call ispell-maybe-find-aspell-dictionaries.
Richard M. Stallman <rms@gnu.org>
parents: 65803
diff changeset
2659 (ispell-maybe-find-aspell-dictionaries)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2660 (if (not recheckp)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2661 (ispell-accept-buffer-local-defs)) ; set up dictionary, local words, etc.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2662 (let ((skip-region-start (make-marker))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2663 (rstart (make-marker)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2664 (unwind-protect
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2665 (save-excursion
64196
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
2666 (message "Spell checking %s using %s with %s dictionary..."
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2667 (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
2668 (buffer-name) "region")
64196
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
2669 (file-name-nondirectory ispell-program-name)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2670 (or ispell-current-dictionary "default"))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2671 ;; Returns cursor to original location.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2672 (save-window-excursion
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2673 (goto-char reg-start)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2674 (let ((transient-mark-mode)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2675 (case-fold-search case-fold-search)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2676 (query-fcc t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2677 in-comment key)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2678 (let (message-log-max)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2679 (message "searching for regions to skip"))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2680 (if (re-search-forward (ispell-begin-skip-region-regexp) reg-end t)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2681 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2682 (setq key (buffer-substring-no-properties
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2683 (match-beginning 0) (match-end 0)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2684 (set-marker skip-region-start (- (point) (length key)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2685 (goto-char reg-start)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2686 (let (message-log-max)
64196
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
2687 (message "Continuing spelling check using %s with %s dictionary..."
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
2688 (file-name-nondirectory ispell-program-name)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2689 (or ispell-current-dictionary "default")))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2690 (set-marker rstart reg-start)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2691 (set-marker ispell-region-end reg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2692 (while (and (not ispell-quit)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2693 (< (point) ispell-region-end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2694 ;; spell-check region with skipping
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2695 (if (and (marker-position skip-region-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2696 (<= skip-region-start (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2697 (progn
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2698 ;; If region inside line comment, must keep comment start.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2699 (setq in-comment (point)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2700 in-comment
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2701 (and comment-start
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2702 (or (null comment-end) (string= "" comment-end))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2703 (save-excursion
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2704 (beginning-of-line)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2705 (re-search-forward comment-start in-comment t))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2706 comment-start))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2707 ;; Can change skip-regexps (in ispell-message)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2708 (ispell-skip-region key) ; moves pt past region.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2709 (set-marker rstart (point))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2710 ;; check for saving large attachments...
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2711 (setq query-fcc (and query-fcc
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2712 (ispell-ignore-fcc skip-region-start
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2713 rstart)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2714 (if (and (< rstart ispell-region-end)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2715 (re-search-forward
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2716 (ispell-begin-skip-region-regexp)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2717 ispell-region-end t))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2718 (progn
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
2719 (setq key (match-string-no-properties 0))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2720 (set-marker skip-region-start
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2721 (- (point) (length key)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2722 (goto-char rstart))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2723 (set-marker skip-region-start nil))))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2724 (setq reg-end (max (point)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2725 (if (marker-position skip-region-start)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2726 (min skip-region-start ispell-region-end)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2727 (marker-position ispell-region-end))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2728 (let* ((start (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2729 (end (save-excursion (end-of-line) (min (point) reg-end)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2730 (string (ispell-get-line start end in-comment)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2731 (if in-comment ; account for comment chars added
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2732 (setq start (- start (length in-comment))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2733 in-comment nil))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2734 (setq end (point)) ; "end" tracks region retrieved.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2735 (if string ; there is something to spell check!
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2736 ;; (special start end)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2737 (setq shift (ispell-process-line string
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2738 (and recheckp shift))))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2739 (goto-char end)))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2740 (if ispell-quit
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2741 nil
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2742 (or shift 0)))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2743 ;; protected
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2744 (if (and (not (and recheckp ispell-keep-choices-win))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2745 (get-buffer ispell-choices-buffer))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2746 (kill-buffer ispell-choices-buffer))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2747 (set-marker skip-region-start nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2748 (set-marker rstart nil)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2749 (if ispell-quit
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2750 (progn
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2751 ;; preserve or clear the region for ispell-continue.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2752 (if (not (numberp ispell-quit))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2753 (set-marker ispell-region-end nil)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2754 ;; Ispell-continue enabled - ispell-region-end is set.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2755 (goto-char ispell-quit))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2756 ;; Check for aborting
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2757 (if (and ispell-checking-message (numberp ispell-quit))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2758 (progn
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2759 (setq ispell-quit nil)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2760 (error "Message send aborted")))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2761 (if (not recheckp) (setq ispell-quit nil)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2762 (if (not recheckp) (set-marker ispell-region-end nil))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2763 ;; Only save if successful exit.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2764 (ispell-pdict-save ispell-silently-savep)
64196
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
2765 (message "Spell-checking using %s with %s dictionary done"
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
2766 (file-name-nondirectory ispell-program-name)
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
2767 (or ispell-current-dictionary "default"))))))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2768
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2769
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2770 (defun ispell-begin-skip-region-regexp ()
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2771 "Returns a regexp of the search keys for region skipping.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2772 Includes `ispell-skip-region-alist' plus tex, tib, html, and comment keys.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2773 Must call after ispell-buffer-local-parsing due to dependence on mode."
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2774 ;; start with regions generic to all buffers
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2775 (let ((skip-regexp (ispell-begin-skip-region ispell-skip-region-alist)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2776 ;; Comments
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2777 (if (and (null ispell-check-comments) comment-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2778 (setq skip-regexp (concat (regexp-quote comment-start) "\\|"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2779 skip-regexp)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2780 (if (and (eq 'exclusive ispell-check-comments) comment-start)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2781 ;; search from end of current comment to start of next comment.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2782 (setq skip-regexp (concat (if (string= "" comment-end) "^"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2783 (regexp-quote comment-end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2784 "\\|" skip-regexp)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2785 ;; tib
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2786 (if ispell-skip-tib
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2787 (setq skip-regexp (concat ispell-tib-ref-beginning "\\|" skip-regexp)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2788 ;; html stuff
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
2789 (if ispell-skip-html
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2790 (setq skip-regexp (concat
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2791 (ispell-begin-skip-region ispell-html-skip-alists)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2792 "\\|"
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2793 skip-regexp)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2794 ;; tex
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2795 (if (eq ispell-parser 'tex)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2796 (setq skip-regexp (concat (ispell-begin-tex-skip-regexp) "\\|"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2797 skip-regexp)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2798 ;; messages
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2799 (if (and ispell-checking-message
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2800 (not (eq t ispell-checking-message)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2801 (setq skip-regexp (concat
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2802 (mapconcat (lambda (lst) (car lst))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2803 ispell-checking-message
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2804 "\\|")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2805 "\\|"
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2806 skip-regexp)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2807
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2808 ;; return new regexp
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2809 skip-regexp))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2810
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2811
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2812 (defun ispell-begin-skip-region (skip-alist)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2813 "Regular expression for start of regions to skip generated from SKIP-ALIST.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2814 Each selection should be a key of SKIP-ALIST;
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2815 otherwise, the current line is skipped."
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2816 (mapconcat (lambda (lst) (if (stringp (car lst)) (car lst) (eval (car lst))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2817 skip-alist
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2818 "\\|"))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2819
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2820
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2821 (defun ispell-begin-tex-skip-regexp ()
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2822 "Regular expression of tex commands to skip.
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2823 Generated from `ispell-tex-skip-alists'."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2824 (concat
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2825 ;; raw tex keys
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2826 (mapconcat (function (lambda (lst) (car lst)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2827 (car ispell-tex-skip-alists)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2828 "\\|")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2829 "\\|"
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2830 ;; keys wrapped in begin{}
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2831 (mapconcat (function (lambda (lst)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2832 (concat "\\\\begin[ \t\n]*{[ \t\n]*"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2833 (car lst)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2834 "[ \t\n]*}")))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2835 (car (cdr ispell-tex-skip-alists))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2836 "\\|")))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2837
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2838
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2839 (defun ispell-skip-region-list ()
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2840 "Returns a list describing key and body regions to skip for this buffer.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2841 Includes regions defined by `ispell-skip-region-alist', tex mode,
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2842 `ispell-html-skip-alists', and `ispell-checking-message'.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2843 Manual checking must include comments and tib references.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2844 The list is of the form described by variable `ispell-skip-region-alist'.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2845 Must call after `ispell-buffer-local-parsing' due to dependence on mode."
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2846 (let ((skip-alist ispell-skip-region-alist))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2847 ;; only additional explicit region definition is tex.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2848 (if (eq ispell-parser 'tex)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2849 (setq case-fold-search nil
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2850 skip-alist (append (car ispell-tex-skip-alists)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2851 (car (cdr ispell-tex-skip-alists))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2852 skip-alist)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2853 (if ispell-skip-html
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2854 (setq skip-alist (append ispell-html-skip-alists skip-alist)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2855 (if (and ispell-checking-message
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2856 (not (eq t ispell-checking-message)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2857 (setq skip-alist (append ispell-checking-message skip-alist)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2858 skip-alist))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2859
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2860
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2861 (defun ispell-tex-arg-end (&optional arg)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2862 "Skip across ARG number of braces."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2863 (condition-case nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2864 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2865 (while (looking-at "[ \t\n]*\\[") (forward-sexp))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2866 (forward-sexp (or arg 1)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2867 (error
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2868 (message "error skipping s-expressions at point %d." (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2869 (beep)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2870 (sit-for 2))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2871
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2872
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2873 (defun ispell-ignore-fcc (start end)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2874 "Deletes the Fcc: message header when large attachments are included.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2875 Return value `nil' if file with large attachments are saved.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2876 This can be used to avoid multiple questions for multiple large attachments.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2877 Returns point to starting location afterwards."
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2878 (let ((result t))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2879 (if (and ispell-checking-message ispell-message-fcc-skip)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2880 (if (< ispell-message-fcc-skip (- end start))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2881 (let (case-fold-search head-end)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2882 (goto-char (point-min))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2883 (setq head-end
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2884 (or (re-search-forward
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2885 (concat "^" (regexp-quote mail-header-separator) "$")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2886 nil t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2887 (re-search-forward "^$" nil t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2888 (point-min)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2889 (goto-char (point-min))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2890 (if (re-search-forward "^Fcc:" head-end t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2891 (if (y-or-n-p
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2892 "Save copy of this message with large attachments? ")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2893 (setq result nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2894 (beginning-of-line)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2895 (kill-line 1)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2896 (goto-char end))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2897 result))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2898
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2899
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2900 (defun ispell-skip-region (key)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2901 "Skips across KEY and then to end of region.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2902 Key lookup determines region to skip.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2903 Point is placed at end of skipped region."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2904 ;; move over key to begin checking.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2905 (forward-char (length key))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2906 (let ((start (point))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2907 ;; Regenerate each call... This function can change region definition.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2908 (alist (ispell-skip-region-list))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2909 alist-key null-skip)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2910 (cond
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2911 ;; what about quoted comment, or comment inside strings?
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2912 ((and (null ispell-check-comments) comment-start
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2913 (string= key comment-start))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2914 (if (string= "" comment-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2915 (forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2916 (search-forward comment-end ispell-region-end t)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2917 ((and (eq 'exclusive ispell-check-comments) comment-start
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2918 (string= key comment-end))
22526
56bcedfdbe83 (ispell-skip-region): Don't complain when
Karl Heuer <kwzh@gnu.org>
parents: 22461
diff changeset
2919 (search-forward comment-start ispell-region-end :end))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2920 ((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
2921 (re-search-forward ispell-tib-ref-end ispell-region-end t))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2922 ;; markings from alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2923 (t
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2924 (while alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2925 (setq alist-key (eval (car (car alist))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2926 (if (string-match alist-key key)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2927 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2928 (setq alist (cdr (car alist)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2929 (cond
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2930 ((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
2931 ((not (consp alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2932 ;; 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
2933 (re-search-forward (eval alist) (point-max) t))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2934 ((and (= 1 (length alist))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2935 (stringp (car alist)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2936 (re-search-forward (car alist) (point-max) t))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2937 (t
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2938 (setq null-skip t) ; error handling in functions!
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2939 (if (consp (cdr alist))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2940 (apply (car alist) (cdr alist))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2941 (funcall (car alist)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2942 (setq alist nil))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2943 (setq alist (cdr alist))))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2944 (if (and (= start (point)) (null null-skip))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2945 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2946 (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
2947 key (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2948 (beep)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2949 (sit-for 2)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2950
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2951
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2952 ;;; Grab the next line of data.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2953 ;;; Returns a string with the line data
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2954 (defun ispell-get-line (start end in-comment)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2955 (let ((ispell-casechars (ispell-get-casechars))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2956 string)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2957 (cond ; LOOK AT THIS LINE AND SKIP OR PROCESS
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2958 ((eolp) ; END OF LINE, just go to next line.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2959 (forward-line))
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
2960 ;;((looking-at "[-#@*+!%~^]") ; SKIP SPECIAL ISPELL CHARACTERS
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2961 ;; (forward-char 1)) ; not needed as quoted below.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2962 ((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
2963 (re-search-forward "[][()${}]" end t)) ; or MATH COMMANDS
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2964 (setq string (concat "^" in-comment
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2965 (buffer-substring-no-properties start end)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2966 "\n"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2967 (goto-char end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2968 (t (goto-char end))) ; EMPTY LINE, skip it.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2969 string))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2970
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2971
59627
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
2972 (defun ispell-looking-at (string)
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
2973 (let ((coding (ispell-get-coding-system))
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
2974 (len (length string)))
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
2975 (and (<= (+ (point) len) (point-max))
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
2976 (equal (encode-coding-string string coding)
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
2977 (encode-coding-string (buffer-substring-no-properties
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
2978 (point) (+ (point) len))
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
2979 coding)))))
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
2980
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
2981 ;;; Avoid error messages when compiling for these dynamic variables.
68198
f00134dbd2a6 (ispell-internal-change-dictionary, ispell-change-dictionary):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68195
diff changeset
2982 (defvar start)
f00134dbd2a6 (ispell-internal-change-dictionary, ispell-change-dictionary):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68195
diff changeset
2983 (defvar end)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
2984
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2985 (defun ispell-process-line (string shift)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2986 "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
2987 This will modify the buffer for spelling errors.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2988 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
2989 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
2990 ;;(declare special start end)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2991 (let (poss accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2992 (if (not (numberp shift))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2993 (setq shift 0))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2994 ;; 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
2995 (ispell-send-string string)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2996 (while (progn
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2997 (ispell-accept-output)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2998 ;; Last item of output contains a blank line.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2999 (not (string= "" (car ispell-filter)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3000 ;; 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
3001 ;; Place in FIFO order and remove the blank item.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3002 (setq ispell-filter (nreverse (cdr ispell-filter)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3003 (while (and (not ispell-quit) ispell-filter)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3004 ;; get next word, accounting for accepted words and start shifts
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3005 (setq poss (ispell-parse-output (car ispell-filter)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3006 accept-list shift))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3007 (if (and poss (listp poss)) ; spelling error occurred.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3008 ;; Whenever we have misspellings, we can change
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3009 ;; the buffer. Keep boundaries as markers.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3010 ;; Markers can move with highlighting! This destroys
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3011 ;; 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
3012 (let ((word-start
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3013 (copy-marker (+ start ispell-offset (car (cdr poss)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3014 (word-len (length (car poss)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3015 (line-end (copy-marker end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3016 (line-start (copy-marker start))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3017 recheck-region replace)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3018 (goto-char word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3019 ;; Adjust the horizontal scroll & point
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3020 (ispell-horiz-scroll)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3021 (goto-char (+ word-len word-start))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3022 (ispell-horiz-scroll)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3023 (goto-char word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3024 (ispell-horiz-scroll)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3025
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3026 ;; Alignment cannot be tracked and this error will occur when
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3027 ;; `query-replace' makes multiple corrections on the starting line.
59627
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
3028 (or (ispell-looking-at (car poss))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3029 ;; This occurs due to filter pipe problems
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3030 (error (concat "Ispell misalignment: word "
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3031 "`%s' point %d; probably incompatible versions")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3032 (car poss) (marker-position word-start)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3033 ;; ispell-cmd-loop can go recursive & change buffer
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3034 (if ispell-keep-choices-win
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3035 (setq replace (ispell-command-loop
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3036 (car (cdr (cdr poss)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3037 (car (cdr (cdr (cdr poss))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3038 (car poss) (marker-position word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3039 (+ word-len (marker-position word-start))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3040 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3041 (setq replace (ispell-command-loop
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3042 (car (cdr (cdr poss)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3043 (car (cdr (cdr (cdr poss))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3044 (car poss) (marker-position word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3045 (+ word-len (marker-position word-start))))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3046
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3047 (goto-char word-start)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3048 ;; Recheck when query replace edit changes misspelled word.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3049 ;; 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
3050 (if (and replace (listp replace) (= 2 (length replace)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3051 (if (and (eq ispell-parser 'tex)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3052 (string-match "[\\\\][]()[]\\|\\\\begin\\|\\$"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3053 (regexp-quote string)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3054 (error
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3055 "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
3056 )
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3057 (set-marker line-end (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3058 (setq ispell-filter nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3059 recheck-region t)))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3060
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3061 ;; insert correction if needed
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3062 (cond
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3063 ((or (null replace)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3064 (equal 0 replace)) ; ACCEPT/INSERT
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3065 (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3066 (ispell-add-per-file-word-list (car poss)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3067 ;; do not recheck accepted word on this line
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3068 (setq accept-list (cons (car poss) accept-list)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3069 (t ; replacement word selected or entered
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3070 (delete-region (point) (+ word-len (point)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3071 (if (not (listp replace))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3072 (progn
60530
32fd45514893 (ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents: 60284
diff changeset
3073 (ispell-insert-word replace) ; insert dictionary word
56932
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
3074 (ispell-send-replacement (car poss) replace)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3075 (setq accept-list (cons replace accept-list)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3076 (let ((replace-word (car replace)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3077 ;; Recheck hand entered replacement word
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3078 (insert replace-word)
56932
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
3079 (ispell-send-replacement (car poss) replace-word)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3080 (if (car (cdr replace))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3081 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3082 (delete-other-windows) ; to correctly show help.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3083 ;; Assume case-replace &
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3084 ;; case-fold-search correct?
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3085 (query-replace (car poss) (car replace) t)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3086 (goto-char word-start)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3087 ;; do not recheck if already accepted
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3088 (if (member replace-word accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3089 (setq accept-list (cons replace-word accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3090 replace replace-word)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3091 (let ((region-end (copy-marker ispell-region-end)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3092 (setq recheck-region ispell-filter
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3093 ispell-filter nil ; save filter
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3094 shift 0 ; already accounted
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3095 shift (ispell-region
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3096 word-start
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3097 (+ word-start (length replace-word))
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3098 t shift))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3099 (if (null shift) ; quitting check.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3100 (setq shift 0))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3101 (set-marker ispell-region-end region-end)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3102 (set-marker region-end nil)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3103 (setq ispell-filter recheck-region
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3104 recheck-region nil
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3105 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
3106
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3107 (setq shift (+ shift (- (length replace) word-len)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3108
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3109 ;; Move line-start across word...
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3110 ;; new shift function does this now...
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3111 ;;(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
3112 ;; (- (length replace)
313ef0d76864 (ispell-menu-map-needed): Check that ispell-process
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28563
diff changeset
3113 ;; (length (car poss)))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3114 ))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3115 (if (not ispell-quit)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3116 (let (message-log-max)
64196
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
3117 (message "Continuing spelling check using %s with %s dictionary..."
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
3118 (file-name-nondirectory ispell-program-name)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3119 (or ispell-current-dictionary "default"))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3120 (sit-for 0)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3121 (setq start (marker-position line-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3122 end (marker-position line-end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3123 ;; Adjust markers when end of region lost from highlighting.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3124 (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
3125 (setq end (+ word-start word-len)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3126 (if (= word-start ispell-region-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3127 (set-marker ispell-region-end (+ word-start word-len)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3128 ;; going out of scope - unneeded
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3129 (set-marker line-start nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3130 (set-marker word-start nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3131 (set-marker line-end nil)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3132 ;; finished with misspelling!
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3133 (setq ispell-filter (cdr ispell-filter)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3134 shift))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3135
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3136
20389
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3137 ;;;###autoload
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3138 (defun ispell-comments-and-strings ()
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3139 "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
3140 (interactive)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3141 (goto-char (point-min))
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3142 (let (state done)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3143 (while (not done)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3144 (setq done t)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3145 (setq state (parse-partial-sexp (point) (point-max)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3146 nil nil state 'syntax-table))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3147 (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
3148 (let ((start (point)))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3149 (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
3150 nil nil state 'syntax-table))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3151 (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
3152 (error "Unterminated string or comment"))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3153 (save-excursion
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3154 (setq done (not (ispell-region start (point))))))))))
20389
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3155
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3156
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3157 ;;;###autoload
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3158 (defun ispell-buffer ()
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3159 "Check the current buffer for spelling errors interactively."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3160 (interactive)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3161 (ispell-region (point-min) (point-max)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3162
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3163
6288
3197bf3cc0a1 (ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents: 6285
diff changeset
3164 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3165 (defun ispell-continue ()
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3166 "Continue a halted spelling session beginning with the current word."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3167 (interactive)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3168 (if (not (marker-position ispell-region-end))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3169 (message "No session to continue. Use 'X' command when checking!")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3170 (if (not (equal (marker-buffer ispell-region-end) (current-buffer)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3171 (message "Must continue ispell from buffer %s"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3172 (buffer-name (marker-buffer ispell-region-end)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3173 (ispell-region
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3174 ;; find beginning of current word:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3175 (car (cdr (ispell-get-word t)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3176 (marker-position ispell-region-end)))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3177
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3178
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3179 ;;; Horizontal scrolling
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3180 (defun ispell-horiz-scroll ()
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3181 "Places point within the horizontal visibility of its window area."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3182 (if truncate-lines ; display truncating lines?
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3183 ;; See if display needs to be scrolled.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3184 (let ((column (- (current-column) (max (window-hscroll) 1))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3185 (if (and (< column 0) (> (window-hscroll) 0))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3186 (scroll-right (max (- column) 10))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3187 (if (>= column (- (window-width) 2))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3188 (scroll-left (max (- column (window-width) -3) 10)))))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3189
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3190
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3191 ;;; Interactive word completion.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3192 ;;; Forces "previous-word" processing. Do we want to make this selectable?
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3193
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3194 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3195 (defun ispell-complete-word (&optional interior-frag)
41949
66bf9fec7803 (ispell-complete-word): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 41937
diff changeset
3196 "Try to complete the word before or under point (see `lookup-words').
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3197 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
3198 sequence inside of a word.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3199
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3200 Standard ispell choices are then available."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3201 (interactive "P")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3202 (let ((cursor-location (point))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3203 (case-fold-search-val case-fold-search)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3204 (word (ispell-get-word nil "\\*")) ; force "previous-word" processing.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3205 start end possibilities replacement)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3206 (setq start (car (cdr word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3207 end (car (cdr (cdr word)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3208 word (car word)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3209 possibilities
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3210 (or (string= word "") ; Will give you every word
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3211 (lookup-words (concat (and interior-frag "*") word
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3212 (if (or interior-frag (null ispell-look-p))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3213 "*"))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3214 ispell-complete-word-dict)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3215 (cond ((eq possibilities t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3216 (message "No word to complete"))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3217 ((null possibilities)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3218 (message "No match for \"%s\"" word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3219 (t ; There is a modification...
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3220 (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
3221 (cond
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3222 ((string-equal (upcase word) word)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3223 (setq possibilities (mapcar 'upcase possibilities)))
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
3224 ((eq (upcase (aref word 0)) (aref word 0))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3225 (setq possibilities (mapcar (function
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3226 (lambda (pos)
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
3227 (if (eq (aref word 0) (aref pos 0))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3228 pos
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3229 (capitalize pos))))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3230 possibilities))))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3231 (setq case-fold-search case-fold-search-val)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
3232 (save-window-excursion
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
3233 (setq replacement
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
3234 (ispell-command-loop possibilities nil word start end)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3235 (cond
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3236 ((equal 0 replacement) ; BUFFER-LOCAL ADDITION
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3237 (ispell-add-per-file-word-list word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3238 (replacement ; REPLACEMENT WORD
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3239 (delete-region start end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3240 (setq word (if (atom replacement) replacement (car replacement))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3241 cursor-location (+ (- (length word) (- end start))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3242 cursor-location))
60530
32fd45514893 (ispell-insert-word): New function.
Kenichi Handa <handa@m17n.org>
parents: 60284
diff changeset
3243 (ispell-insert-word word)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3244 (if (not (atom replacement)) ; recheck spelling of replacement.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3245 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3246 (goto-char cursor-location)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3247 (ispell-word nil t)))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3248 (if (get-buffer ispell-choices-buffer)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3249 (kill-buffer ispell-choices-buffer))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3250 (ispell-pdict-save ispell-silently-savep)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3251 (goto-char cursor-location)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3252
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3253
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3254 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3255 (defun ispell-complete-word-interior-frag ()
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3256 "Completes word matching character sequence inside a word."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3257 (interactive)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3258 (ispell-complete-word t))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3259
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
3260
30563
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3261 ;;;###autoload
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3262 (defun ispell ()
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3263 "Interactively check a region or buffer for spelling errors.
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3264 If `transient-mark-mode' is on, and a region is active, spell-check
34364
243429d5e6d2 (ispell): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34131
diff changeset
3265 that region. Otherwise spell-check the buffer.
243429d5e6d2 (ispell): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34131
diff changeset
3266
243429d5e6d2 (ispell): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34131
diff changeset
3267 Ispell dictionaries are not distributed with Emacs. If you are
243429d5e6d2 (ispell): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34131
diff changeset
3268 looking for a dictionary, please see the distribution of the GNU ispell
243429d5e6d2 (ispell): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34131
diff changeset
3269 program, or do an Internet search; there are various dictionaries
243429d5e6d2 (ispell): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34131
diff changeset
3270 available on the net."
30563
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3271 (interactive)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3272 (if (and (boundp 'transient-mark-mode) transient-mark-mode
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3273 (boundp 'mark-active) mark-active)
30563
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3274 (ispell-region (region-beginning) (region-end))
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3275 (ispell-buffer)))
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3276
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3277
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3278 ;;; **********************************************************************
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3279 ;;; Ispell Minor Mode
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3280 ;;; **********************************************************************
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3281
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3282 (defvar ispell-minor-mode nil
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3283 "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
3284 ;; 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
3285 (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
3286
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3287 (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
3288 (setq minor-mode-alist
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3289 (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
3290
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3291 (defvar ispell-minor-keymap
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3292 (let ((map (make-sparse-keymap)))
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3293 (define-key map " " 'ispell-minor-check)
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3294 (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
3295 map)
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3296 "Keymap used for Ispell minor mode.")
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3297
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3298 (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
3299 (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
3300 (setq minor-mode-map-alist
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3301 (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
3302 minor-mode-map-alist)))
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3303
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3304 ;;;###autoload
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3305 (defun ispell-minor-mode (&optional arg)
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3306 "Toggle Ispell minor mode.
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3307 With prefix arg, turn Ispell minor mode on iff arg is positive.
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3308
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3309 In Ispell minor mode, pressing SPC or RET
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3310 warns you if the previous word is incorrectly spelled.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3311
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3312 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
3313 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
3314 (interactive "P")
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3315 (setq ispell-minor-mode
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3316 (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
3317 (<= (prefix-numeric-value arg) 0))))
11562
8ff50a0715e1 (ispell-minor-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents: 11469
diff changeset
3318 (force-mode-line-update))
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3319
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3320 (defun ispell-minor-check ()
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3321 "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
3322 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
3323 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
3324 (interactive "*")
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3325 (let ((ispell-minor-mode nil)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3326 (ispell-check-only t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3327 (last-char (char-after (1- (point)))))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3328 (command-execute (key-binding (this-command-keys)))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3329 (if (not (or (eq last-char ?\ ) (eq last-char ?\n)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3330 (and ispell-skip-html (eq last-char ?>))
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3331 (and ispell-skip-html (eq last-char ?\;))))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3332 (ispell-word nil t))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3333
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
3334
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3335 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3336 ;;; Ispell Message
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3337 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3338
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3339 (defvar ispell-message-text-end
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3340 (mapconcat (function identity)
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3341 '(
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3342 ;; Don't spell check signatures
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3343 "^-- $"
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3344 ;; Matches postscript files.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3345 ;;"^%!PS-Adobe-[123].0"
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3346 ;; Matches uuencoded text
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3347 ;;"^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
3348 ;; Matches shell files (especially auto-decoding)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
3349 "^#! /bin/[ck]?sh"
8387
7dca276b66d8 (ispell-message-text-end): Improve context diff regexp.
Richard M. Stallman <rms@gnu.org>
parents: 8298
diff changeset
3350 ;; Matches context difference listing
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3351 "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3352 ;; Matches unidiff difference listing
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3353 "\\(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
3354 ;; Matches reporter.el bug report
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3355 "^current state:\n==============\n"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3356 ;; Matches commonly used "cut" boundaries
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3357 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|Environment Follows\\)")
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3358 "\\|")
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3359 "*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
3360 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
3361 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
3362
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3363
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3364 (defun ispell-mime-multipartp (&optional limit)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3365 "Return multipart message start boundary or nil if none."
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3366 ;; caller must ensure `case-fold-search' is set to `t'
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3367 (and
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3368 (re-search-forward
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3369 "Content-Type: *multipart/\\([^ \t\n]*;[ \t]*[\n]?[ \t]*\\)+boundary="
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3370 limit t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3371 (let (boundary)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3372 (if (looking-at "\"")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3373 (let (start)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3374 (forward-char)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3375 (setq start (point))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3376 (while (not (looking-at "\""))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3377 (forward-char 1))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3378 (setq boundary (buffer-substring-no-properties start (point))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3379 (let ((start (point)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3380 (while (looking-at "[-0-9a-zA-Z'()+_,./:=?]")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3381 (forward-char))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3382 (setq boundary (buffer-substring-no-properties start (point)))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3383 (if (< (length boundary) 1)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3384 (setq boundary nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3385 (concat "--" boundary)))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3386
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3387
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3388 (defun ispell-mime-skip-part (boundary)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3389 "Moves point across header, or entire MIME part if message is encoded.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3390 All specified types except `7bit' `8bit' and `quoted-printable' are considered
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3391 encoded and therefore skipped. See rfc 1521, 2183, ...
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3392 If no boundary is given, then entire message is skipped.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3393
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3394 This starts one line ABOVE the MIME content messages, on the boundary marker,
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3395 for operation with the generic region-skipping code.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3396 This places new MIME boundaries into variable `ispell-checking-message'."
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3397 (forward-line) ; skip over boundary to headers
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3398 (let ((save-case-fold-search case-fold-search)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3399 (continuep t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3400 textp)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3401 (setq case-fold-search t
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3402 ispell-skip-html nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3403 (while continuep
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3404 (setq continuep nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3405 (if (looking-at "Content-Type: *text/")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3406 (progn
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3407 (goto-char (match-end 0))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3408 (if (looking-at "html")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3409 (setq ispell-skip-html t))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3410 (setq textp t
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3411 continuep t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3412 (re-search-forward "\\(.*;[ \t]*[\n]\\)*.*$" nil t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3413 (forward-line)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3414 (if (looking-at "Content-Transfer-Encoding: *\\([^ \t\n]*\\)")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3415 (let ((match (buffer-substring (match-beginning 1) (match-end 1))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3416 (setq textp (member (upcase match)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3417 ;; only spell check the following encodings:
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3418 '("7BIT" "8BIT" "QUOTED-PRINTABLE" "BINARY"))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3419 continuep t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3420 (goto-char (match-end 0))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3421 (re-search-forward "\\(.*;[ \t]*[\n]\\)*.*$" nil t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3422 (forward-line)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3423 ;; hierarchical boundary definition
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3424 (if (looking-at "Content-Type: *multipart/")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3425 (let ((new-boundary (ispell-mime-multipartp)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3426 (if (string-match new-boundary boundary)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3427 (setq continuep t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3428 ;; first pass redefine skip function to include new boundary
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3429 ;;(re-search-backward boundary nil t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3430 (forward-line)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3431 (setq ispell-checking-message
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3432 (cons
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3433 (list new-boundary 'ispell-mime-skip-part new-boundary)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3434 (if (eq t ispell-checking-message) nil
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3435 ispell-checking-message))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3436 textp t
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3437 continuep t)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3438 ;; Skip all MIME headers that don't affect spelling
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3439 (if (looking-at "Content-[^ \t]*: *\\(.*;[ \t]*[\n]\\)*.*$")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3440 (progn
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3441 (setq continuep t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3442 (goto-char (match-end 0))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3443 (forward-line)))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3444
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3445 (setq case-fold-search save-case-fold-search)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3446 (if textp
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3447 (point)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3448 ;; encoded message. Skip to boundary, or entire message.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3449 (if (not boundary)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3450 (goto-char (point-max))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3451 (re-search-forward boundary nil t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3452 (beginning-of-line)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3453 (point)))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3454
12260
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
3455
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3456 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3457 (defun ispell-message ()
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3458 "Check the spelling of a mail message or news post.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3459 Don't check spelling of message headers except the Subject field.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3460 Don't check included messages.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3461
15551
9cbd488c1872 (ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents: 15312
diff changeset
3462 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
3463 use the `x' command. (Any subsequent regions will be checked.)
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
3464 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
3465
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3466 To spell-check whenever a message is sent, include the appropriate lines
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3467 in your .emacs file:
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3468 (add-hook 'message-send-hook 'ispell-message) ;; GNUS 5
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3469 (add-hook 'news-inews-hook 'ispell-message) ;; GNUS 4
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3470 (add-hook 'mail-send-hook 'ispell-message)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3471 (add-hook 'mh-before-send-letter-hook 'ispell-message)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3472
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
3473 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
3474 `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
3475 (function (lambda () (local-set-key \"\\C-ci\" 'ispell-message)))"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3476 (interactive)
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3477 (save-excursion
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3478 (goto-char (point-min))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3479 (let* (boundary mimep
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3480 (ispell-skip-region-alist-save ispell-skip-region-alist)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3481 ;; 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
3482 ;; Non-nil marker of end of headers.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3483 (internal-messagep
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3484 (re-search-forward
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3485 (concat "^" (regexp-quote mail-header-separator) "$") nil t))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3486 (end-of-headers ; Start of body.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3487 (copy-marker
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3488 (or internal-messagep
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3489 (re-search-forward "^$" nil t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3490 (point-min))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3491 (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
3492 (cond
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3493 ((not ispell-message-text-end) (point-max))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3494 ((char-or-string-p ispell-message-text-end)
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3495 (if (re-search-forward ispell-message-text-end nil t)
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3496 (match-beginning 0)
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3497 (point-max)))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3498 (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
3499 (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
3500 (if (and (boundp 'mail-yank-prefix) mail-yank-prefix)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3501 (ispell-non-empty-string mail-yank-prefix)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3502 " \\|\t"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3503 (cite-regexp ;Prefix of quoted text
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3504 (cond
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3505 ((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
3506 (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
57516
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3507 (with-no-warnings
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3508 (ispell-non-empty-string sc-reference-tag-string))))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3509 ((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
3510 (concat "\\(" sc-cite-regexp "\\)" "\\|"
57516
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3511 (with-no-warnings
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3512 (ispell-non-empty-string sc-reference-tag-string))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3513 ((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
3514 (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
3515 (concat "In article <" "\\|"
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3516 "[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|"
57516
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3517 (with-no-warnings message-cite-prefix-regexp)
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3518 "\\|"
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3519 default-prefix))
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3520 ((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
3521 (concat "[^,;&+=\n]+ writes:" "\\|"
57516
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3522 (with-no-warnings
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3523 (ispell-non-empty-string mh-ins-buf-prefix))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3524 ((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
3525 (concat "In [a-zA-Z.]+ you write:" "\\|"
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3526 "In <[^,;&+=]+> [^,;&+=]+ writes:" "\\|"
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3527 " *> *"))
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3528 ((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
3529 (concat "[^,;&+=\n]+ writes:" "\\|"
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3530 (ispell-non-empty-string vm-included-text-prefix)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3531 (t default-prefix)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3532 (ispell-skip-region-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3533 (cons (list (concat "^\\(" cite-regexp "\\)")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3534 (function forward-line))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3535 ispell-skip-region-alist))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3536 (old-case-fold-search case-fold-search)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3537 (dictionary-alist ispell-message-dictionary-alist)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3538 (ispell-checking-message t))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3539
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3540 ;; Select dictionary for message
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3541 (or (local-variable-p 'ispell-local-dictionary (current-buffer))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3542 (while dictionary-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3543 (goto-char (point-min))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3544 (if (re-search-forward (car (car dictionary-alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3545 end-of-headers t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3546 (setq ispell-local-dictionary (cdr (car dictionary-alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3547 dictionary-alist nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3548 (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
3549
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3550 (unwind-protect
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3551 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3552 ;; Spell check any original Subject:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3553 (goto-char (point-min))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3554 (setq case-fold-search t
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3555 mimep (re-search-forward "MIME-Version:" end-of-headers t))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3556 (goto-char (point-min))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3557 (if (re-search-forward "^Subject: *" end-of-headers t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3558 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3559 (goto-char (match-end 0))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3560 (if (and (not (looking-at ".*Re\\>"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3561 (not (looking-at "\\[")))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3562 (progn
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3563 (setq case-fold-search old-case-fold-search)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3564 (ispell-region (point)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3565 (progn ;Tab-initiated continuation lns.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3566 (end-of-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3567 (while (looking-at "\n[ \t]")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3568 (end-of-line 2))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3569 (point)))))))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3570 (if mimep
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3571 (progn
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3572 (goto-char (point-min))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3573 (setq boundary (ispell-mime-multipartp end-of-headers))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3574 ;; Adjust message limit to MIME message if necessary.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3575 (and boundary
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3576 (re-search-forward (concat boundary "--") nil t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3577 (re-search-backward boundary nil t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3578 (< (point) (marker-position limit))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3579 (set-marker limit (point)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3580 (goto-char (point-min))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3581 ;; Select type or skip checking if this is a non-multipart message
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3582 ;; Point moved to end of buffer if region is encoded.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3583 (if (and mimep (not boundary))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3584 (let (skip-regexp) ; protect from `ispell-mime-skip-part'
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3585 (goto-char (point-min))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3586 (re-search-forward "Content-[^ \t]*:" end-of-headers t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3587 (forward-line -1) ; following fn starts one line above
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3588 (ispell-mime-skip-part nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3589 ;; if message-text-end region, limit may be less than point.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3590 (if (> (point) limit)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3591 (set-marker limit (point)))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3592 (goto-char (max end-of-headers (point)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3593 (forward-line 1)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3594 (setq case-fold-search old-case-fold-search)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3595 ;; Define MIME regions to skip.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3596 (if boundary
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3597 (setq ispell-checking-message
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3598 (list (list boundary 'ispell-mime-skip-part boundary))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3599 (ispell-region (point) limit))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3600 (set-marker end-of-headers nil)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3601 (set-marker limit nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3602 (setq ispell-skip-region-alist ispell-skip-region-alist-save
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3603 ispell-skip-html nil
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3604 case-fold-search old-case-fold-search)))))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3605
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3606
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3607 (defun ispell-non-empty-string (string)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3608 (if (or (not string) (string-equal string ""))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3609 "\\'\\`" ; An unmatchable string if string is null.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3610 (regexp-quote string)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3611
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3612
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3613 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3614 ;;; Buffer Local Functions
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3615 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3616
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3617
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3618 (defun ispell-accept-buffer-local-defs ()
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3619 "Load all buffer-local information, restarting Ispell when necessary."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3620 (ispell-buffer-local-dict) ; May kill ispell-process.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3621 (ispell-buffer-local-words) ; Will initialize ispell-process.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3622 (ispell-buffer-local-parsing))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3623
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3624
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3625 (defun ispell-buffer-local-parsing ()
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
3626 "Place Ispell into parsing mode for this buffer.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3627 Overrides the default parsing mode.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3628 Includes Latex/Nroff modes and extended character mode."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3629 ;; (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
3630 (ispell-send-string "!\n") ; Put process in terse mode.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3631 ;; 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
3632 ;; 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
3633 (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
3634 (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
3635 (string-match "[Tt][Ee][Xx]-mode"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3636 (symbol-name major-mode)))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3637 (eq ispell-parser 'tex)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3638 (progn
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3639 (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
3640 (if (not (eq ispell-parser 'tex))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3641 (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
3642 (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
3643 ;; If needed, test for SGML & HTML modes and set a buffer local nil/t value.
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3644 (if (and ispell-skip-html (not (eq ispell-skip-html t)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3645 (setq ispell-skip-html
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3646 (not (null (string-match "sgml\\|html\\|xml"
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3647 (downcase (symbol-name major-mode)))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3648 ;; Set default extended character mode for given buffer, if any.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3649 (let ((extended-char-mode (ispell-get-extended-character-mode)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3650 (if extended-char-mode
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3651 (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
3652 ;; Set buffer-local parsing mode and extended character mode, if specified.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3653 (save-excursion
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3654 (goto-char (point-max))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3655 ;; Uses last occurrence of ispell-parsing-keyword
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3656 (if (search-backward ispell-parsing-keyword nil t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3657 (let ((end (save-excursion (end-of-line) (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3658 string)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3659 (search-forward ispell-parsing-keyword)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3660 (while (re-search-forward " *\\([^ \"]+\\)" end t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3661 ;; space separated definitions.
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
3662 (setq string (downcase (match-string-no-properties 1)))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3663 (cond ((and (string-match "latex-mode" string)
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3664 (not (eq 'exclusive ispell-check-comments)))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3665 (ispell-send-string "+\n~tex\n"))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3666 ((string-match "nroff-mode" string)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3667 (ispell-send-string "-\n~nroff\n"))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3668 ((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
3669 (ispell-send-string (concat string "\n")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3670 (t (message "Invalid Ispell Parsing argument!")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3671 (sit-for 2))))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3672
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3673
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3674 ;;; Can kill the current ispell process
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3675
70398
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
3676 (defun ispell-buffer-local-dict (&optional no-reload)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3677 "Initializes local dictionary and local personal dictionary.
70398
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
3678 If optional NO-RELOAD is non-nil, do not make any dictionary reloading.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3679 When a dictionary is defined in the buffer (see variable
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
3680 `ispell-dictionary-keyword'), it will override the local setting
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3681 from \\[ispell-change-dictionary].
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3682 Both should not be used to define a buffer-local dictionary."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3683 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3684 (goto-char (point-min))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3685 (let (end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3686 ;; Override the local variable definition.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3687 ;; Uses last occurrence of ispell-dictionary-keyword.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3688 (goto-char (point-max))
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3689 (unless ispell-local-dictionary-overridden
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3690 (if (search-backward ispell-dictionary-keyword nil t)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3691 (progn
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3692 (search-forward ispell-dictionary-keyword)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3693 (setq end (save-excursion (end-of-line) (point)))
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3694 (if (re-search-forward " *\\([^ \"]+\\)" end t)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3695 (setq ispell-local-dictionary
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
3696 (match-string-no-properties 1))))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3697 (goto-char (point-max))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3698 (if (search-backward ispell-pdict-keyword nil t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3699 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3700 (search-forward ispell-pdict-keyword)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3701 (setq end (save-excursion (end-of-line) (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3702 (if (re-search-forward " *\\([^ \"]+\\)" end t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3703 (setq ispell-local-pdict
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
3704 (match-string-no-properties 1)))))))
70398
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
3705 (unless no-reload
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
3706 ;; Reload if new dictionary (maybe the personal one) defined.
5c3e7e42952a (ispell-buffer-local-dict): Add a `no-reload' argument to avoid the call to
Eli Zaretskii <eliz@gnu.org>
parents: 69830
diff changeset
3707 (ispell-internal-change-dictionary)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3708
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3709
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3710 (defun ispell-buffer-local-words ()
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
3711 "Loads the buffer-local dictionary in the current buffer."
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
3712 ;; If there's an existing ispell process that's wrong for this use,
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
3713 ;; kill it.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3714 (if (and ispell-buffer-local-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3715 (not (equal ispell-buffer-local-name (buffer-name))))
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
3716 (ispell-kill-ispell t))
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
3717 ;; Actually start a new ispell process, because we need
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
3718 ;; to send commands now to specify the local words to it.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3719 (ispell-init-process)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3720 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3721 (goto-char (point-min))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3722 (while (search-forward ispell-words-keyword nil t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3723 (or ispell-buffer-local-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3724 (setq ispell-buffer-local-name (buffer-name)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3725 (let ((end (save-excursion (end-of-line) (point)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3726 (ispell-casechars (ispell-get-casechars))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3727 string)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
3728 ;; 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
3729 ;; 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
3730 (while (re-search-forward " *\\([^ ]+\\)" end t)
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
3731 (setq string (match-string-no-properties 1))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3732 ;; 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
3733 ;; 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
3734 (if (and (< 1 (length string))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3735 (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
3736 (ispell-send-string (concat "@" string "\n"))))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3737
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3738
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3739 ;;; returns optionally adjusted region-end-point.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3740
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3741 (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
3742 "Add WORD to the per-file word list."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3743 (or ispell-buffer-local-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3744 (setq ispell-buffer-local-name (buffer-name)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3745 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3746 (goto-char (point-min))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3747 (let ((old-case-fold-search case-fold-search)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3748 line-okay search done found)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3749 (while (not done)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3750 (setq case-fold-search nil
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3751 search (search-forward ispell-words-keyword nil 'move)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3752 found (or found search)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3753 line-okay (< (+ (length word) 1 ; 1 for space after word..
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3754 (progn (end-of-line) (current-column)))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3755 80)
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3756 case-fold-search old-case-fold-search)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3757 (if (or (and search line-okay)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3758 (null search))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3759 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3760 (setq done t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3761 (if (null search)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3762 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3763 (open-line 1)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3764 (unless found (newline))
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3765 (insert (concat comment-start " " ispell-words-keyword))
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3766 (if (> (length comment-end) 0)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3767 (save-excursion
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3768 (newline)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3769 (insert comment-end)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3770 (insert (concat " " word))))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3771
29078
2e20146198ce Add to debug-ignored-errors.
Dave Love <fx@gnu.org>
parents: 28616
diff changeset
3772 (add-to-list 'debug-ignored-errors "^No word found to check!$")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3773
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3774 (provide 'ispell)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3775
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3776
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3777 ;;; LOCAL VARIABLES AND BUFFER-LOCAL VALUE EXAMPLES.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3778
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3779 ;;; Local Variable options:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3780 ;;; mode: name(-mode)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3781 ;;; eval: expression
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3782 ;;; local-variable: value
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3783
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3784 ;;; 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
3785 ;;; and spell checks only comments.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3786
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3787 ;;; Local Variables:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3788 ;;; mode: emacs-lisp
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3789 ;;; comment-column: 40
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3790 ;;; ispell-check-comments: exclusive
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3791 ;;; ispell-local-dictionary: "american"
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3792 ;;; End:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3793
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3794
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3795 ;;; MORE EXAMPLES OF ISPELL BUFFER-LOCAL VALUES
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3796
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3797 ;;; The following places this file in nroff parsing and extended char modes.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3798 ;;; Local IspellParsing: nroff-mode ~nroff
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3799 ;;; Change IspellPersDict to IspellPersDict: to enable the following line.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3800 ;;; Local IspellPersDict ~/.ispell_lisp
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3801 ;;; 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
3802 ; 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
3803 ; 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
3804 ; 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
3805 ; 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
3806 ; 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
3807 ; 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
3808 ; 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
3809 ; LocalWords: lns XEmacs HTML casechars Multibyte
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3810
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52103
diff changeset
3811 ;;; arch-tag: 4941b9f9-3b7c-4a76-a4ed-5fa8b6010ef5
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3812 ;;; ispell.el ends here