annotate lisp/textmodes/ispell.el @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents 56b71cddc9c5 376148b31b5e
children 61f7601898b1
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,
112218
376148b31b5e Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents: 107074
diff changeset
4 ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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
94670
f4a69fedbd46 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94630
diff changeset
17 ;; GNU Emacs is free software: you can redistribute it and/or modify
14169
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
94670
f4a69fedbd46 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94630
diff changeset
19 ;; the Free Software Foundation, either version 3 of the License, or
f4a69fedbd46 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94630
diff changeset
20 ;; (at your option) any later version.
14169
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
94670
f4a69fedbd46 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94630
diff changeset
28 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
29
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
30 ;; Note: version numbers and time stamp are not updated
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
31 ;; 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
32
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33 ;;; Commentary:
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
34
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
35 ;; INSTRUCTIONS
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
36
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
37 ;; 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
38 ;; 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
39 ;; 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
40 ;; 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
41 ;; themselves.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
42 ;; 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
43 ;; country and language.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
44 ;; 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
45 ;; 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
46 ;; 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
47 ;; your own dictionaries.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
48
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
49 ;; 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
50 ;; (add-hook 'news-inews-hook 'ispell-message)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
51 ;; (add-hook 'mail-send-hook 'ispell-message)
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
52 ;; (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
53
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
54 ;; 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
55 ;; The parsing is controlled by the variable ispell-parser. Currently
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
56 ;; 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
57 ;; 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
58
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
59
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
60 ;; TABLE OF CONTENTS
21873
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 ;; ispell-word
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
63 ;; ispell-region
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
64 ;; ispell-buffer
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
65 ;; ispell-message
20389
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
66 ;; ispell-comments-and-strings
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
67 ;; ispell-continue
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
68 ;; ispell-complete-word
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
69 ;; ispell-complete-word-interior-frag
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
70 ;; ispell-change-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
71 ;; ispell-kill-ispell
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
72 ;; ispell-pdict-save
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
73 ;; ispell-skip-region-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
74
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
75 ;; Commands in ispell-region:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
76 ;; 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
77 ;; ` ': Accept word this time.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
78 ;; `i': Accept word and insert into private dictionary.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
79 ;; `a': Accept word for this session.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
80 ;; `A': Accept word and place in buffer-local dictionary.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
81 ;; `r': Replace word with typed-in value. Rechecked.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
82 ;; `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
83 ;; `?': Show these commands
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
84 ;; `x': Exit spelling buffer. Move cursor to original point.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
85 ;; `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
86 ;; the check to be completed later.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
87 ;; `q': Quit spelling session (Kills ispell process).
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
88 ;; `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
89 ;; `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
90 ;; `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
91 ;; `C-l': redraws screen
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
92 ;; `C-r': recursive edit
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
93 ;; `C-z': suspend Emacs or iconify frame
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
94
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
95 ;; Buffer-Local features:
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
96 ;; 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
97 ;; ispell for the current buffer. This includes language dictionaries,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
98 ;; personal dictionaries, parsing, and local word spellings. Each of these
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
99 ;; local customizations are done either through local variables, or by
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
100 ;; 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
101 ;; 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
102 ;; examples. The local keywords and variables are:
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
103
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
104 ;; ispell-dictionary-keyword language-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
105 ;; uses local variable ispell-local-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
106 ;; ispell-pdict-keyword personal-dictionary
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
107 ;; uses local variable ispell-local-pdict
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
108 ;; ispell-parsing-keyword mode-arg extended-char-arg
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
109 ;; 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
110
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
111 ;; Region skipping:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
112 ;; 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
113 ;; 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
114 ;; 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
115 ;; `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
116
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
117 ;; BUGS:
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
118 ;; 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
119 ;; dictionary entries.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
120 ;; Multi-byte characters if not defined by current dictionary may result in the
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
121 ;; evil "misalignment error" in some versions of MULE Emacs.
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
122 ;; 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
123 ;; see `ispell-help-in-bufferp'.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
124 ;; 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
125 ;; can cause misalignment errors.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
126
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
127 ;; HISTORY
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 ;; Modifications made in latest versions:
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
130
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
131 ;; 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
132 ;; 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
133 ;; 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
134 ;; 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
135 ;; 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
136 ;; 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
137 ;; 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
138 ;; 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
139
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
140 ;; 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
141 ;; 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
142 ;; Added Portuguese dictionary definition.
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
143 ;; 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
144 ;; 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
145 ;; 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
146 ;; 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
147 ;; 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
148
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
149 ;; 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
150 ;; Support new color display functions.
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
151 ;; 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
152 ;; Set to standard Author/Maintainer heading,
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
153 ;; 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
154 ;; Added dictionary definition for Italian (William Deakin)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
155 ;; 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
156 ;; improved menus. Fixed regexp matching http/email addresses.
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
157 ;; one arg always for XEmacs sleep-for (gunnar Evermann)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
158 ;; support for synchronous processes (Eli Zaretskii)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
159
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
160 ;; Revision 3.3 1999/11/29 11:38:34 kss
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
161 ;; Only word replacements entered in from the keyboard are rechecked.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
162 ;; This fixes a bug in tex parsing and misalignment.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
163 ;; 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
164 ;; condition tested. Recursive editing improved.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
165 ;; XEmacs repair for when `enable-multibyte-characters' defined - Didier Verna.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
166 ;; 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
167 ;; 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
168 ;; 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
169 ;; fonts.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
170
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
171 ;; 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
172 ;; 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
173 ;; 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
174 ;; 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
175 ;; 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
176 ;; Removed calls to `when' macro.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
177
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
178 ;; 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
179 ;; Improved and fixed customize support.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
180 ;; 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
181 ;; 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
182 ;; 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
183 ;; Dictionary norsk7-tex removed. Dictionary polish added.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
184 ;; 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
185 ;; 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
186 ;; 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
187 ;; 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
188 ;; 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
189 ;; 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
190 ;; 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
191 ;; 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
192 ;; 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
193 ;; This can otherwise confuse process filters and hang ispell.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
194 ;; Improved skipping support for SGML.
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
195 ;; 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
196 ;; Improved message reference matching in `ispell-message'.
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
197 ;; Fixed bug in returning to nroff mode from tex mode.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
198
103589
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
199 ;;; Compatibility code for XEmacs and (not too) older emacsen:
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
200
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
201 (eval-and-compile ;; Protect against declare-function undefined in XEmacs
101232
f58b15c9942b Protect against declare-function undefined in xemacs.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100992
diff changeset
202 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
f58b15c9942b Protect against declare-function undefined in xemacs.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100992
diff changeset
203
100969
e8584976c413 (ispell-check-minver): Declare.
Glenn Morris <rgm@gnu.org>
parents: 100920
diff changeset
204 (declare-function ispell-check-minver "ispell" (v1 v2))
104002
21a6ee4b9d7f (ispell-looking-back): Update declaration.
Glenn Morris <rgm@gnu.org>
parents: 103589
diff changeset
205 (declare-function ispell-looking-back "ispell"
21a6ee4b9d7f (ispell-looking-back): Update declaration.
Glenn Morris <rgm@gnu.org>
parents: 103589
diff changeset
206 (regexp &optional limit &rest ignored))
100969
e8584976c413 (ispell-check-minver): Declare.
Glenn Morris <rgm@gnu.org>
parents: 100920
diff changeset
207
100616
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
208 (if (fboundp 'version<=)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
209 (defalias 'ispell-check-minver 'version<=)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
210 (defun ispell-check-minver (minver version)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
211 "Check if string VERSION is at least string MINVER.
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
212 Both must be in [0-9]+.[0-9]+... format. This is a fallback
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
213 compatibility function in case `version<=' is not available."
100616
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
214 (let ((pending t)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
215 (return t)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
216 start-ver start-mver)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
217 ;; Loop until an absolute greater or smaller condition is reached
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
218 ;; or until no elements are left in any of version and minver. In
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
219 ;; this case version is exactly the minimal, so return OK.
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
220 (while pending
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
221 (let (ver mver)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
222 (if (string-match "[0-9]+" version start-ver)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
223 (setq start-ver (match-end 0)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
224 ver (string-to-number (match-string 0 version))))
100616
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
225 (if (string-match "[0-9]+" minver start-mver)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
226 (setq start-mver (match-end 0)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
227 mver (string-to-number (match-string 0 minver))))
100616
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
228
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
229 (if (or ver mver)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
230 (progn
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
231 (or ver (setq ver 0))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
232 (or mver (setq mver 0))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
233 ;; If none of below conditions match, this element is the
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
234 ;; same. Go checking next element.
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
235 (if (> ver mver)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
236 (setq pending nil)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
237 (if (< ver mver)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
238 (setq pending nil
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
239 return nil))))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
240 (setq pending nil))))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
241 return)))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
242
103589
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
243 ;; XEmacs does not have looking-back
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
244 (if (fboundp 'looking-back)
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
245 (defalias 'ispell-looking-back 'looking-back)
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
246 (defun ispell-looking-back (regexp &optional limit &rest ignored)
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
247 "Return non-nil if text before point matches regular expression REGEXP.
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
248 Like `looking-at' except matches before point, and is slower.
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
249 LIMIT if non-nil speeds up the search by specifying a minimum
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
250 starting position, to avoid checking matches that would start
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
251 before LIMIT.
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
252
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
253 This is a stripped down compatibility function for use when
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
254 full featured `looking-back' function is missing."
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
255 (save-excursion
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
256 (re-search-backward (concat "\\(?:" regexp "\\)\\=") limit t))))
99f2f3ae1c56 ispell.el: Add `ispell-looking-back' XEmacs compatibility function for `looking-back'
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103564
diff changeset
257
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
258 ;;; Code:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
259
65262
330e799da016 (mail-yank-prefix): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 64965
diff changeset
260 (defvar mail-yank-prefix)
330e799da016 (mail-yank-prefix): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 64965
diff changeset
261
48374
a6f9803f174f (defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46733
diff changeset
262 (defgroup ispell nil
73731
e33303152c03 (ispell, ispell-local-dictionary-alist, ispell-help): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 73080
diff changeset
263 "User variables for Emacs ispell interface."
48374
a6f9803f174f (defgroup ispell): Arrange that definition starts at beginning of
Markus Rost <rost@math.uni-bielefeld.de>
parents: 46733
diff changeset
264 :group 'applications)
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
265
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
266 (if (not (fboundp 'buffer-substring-no-properties))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
267 (defun buffer-substring-no-properties (start end)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
268 (buffer-substring start end)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
269
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
270 (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
271
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
272 ;;; **********************************************************************
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
273 ;;; 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
274 ;;; and location of binaries:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
275 ;;; **********************************************************************
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
276
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
277
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
278 ;;; ******* 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
279
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
280 (defcustom ispell-highlight-p 'block
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
281 "*Highlight spelling errors when non-nil.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
282 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
283 :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
284 :group 'ispell)
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
285
60714
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
286 (defcustom ispell-lazy-highlight (boundp 'lazy-highlight-cleanup)
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
287 "*Controls the lazy-highlighting of spelling errors.
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
288 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
289 error is highlighted lazily using isearch lazy highlighting (see
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
290 `lazy-highlight-initial-delay' and `lazy-highlight-interval')."
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
291 :type 'boolean
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
292 :group 'lazy-highlight
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
293 :group 'ispell
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
294 :version "22.1")
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
295
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
296 (defcustom ispell-highlight-face (if ispell-lazy-highlight 'isearch 'highlight)
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
297 "*The face used for Ispell highlighting. For Emacsen with overlays.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
298 Possible values are `highlight', `modeline', `secondary-selection',
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
299 `region', and `underline'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
300 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
301 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
302 slightly different."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
303 :type 'face
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
304 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
305
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
306 (defcustom ispell-check-comments t
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
307 "*Spelling of comments checked when non-nil.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
308 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
309 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
310 may produce undesired results."
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
311 :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
312 :group 'ispell)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
313 ;;;###autoload
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
314 (put 'ispell-check-comments 'safe-local-variable
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
315 (lambda (a) (memq a '(nil t exclusive))))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
316
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
317 (defcustom ispell-query-replace-choices nil
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
318 "*Corrections made throughout region when non-nil.
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
319 Uses `query-replace' (\\[query-replace]) for corrections."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
320 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
321 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
322
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
323 (defcustom ispell-skip-tib nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
324 "*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
325 Skips any text between strings matching regular expressions
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
326 `ispell-tib-ref-beginning' and `ispell-tib-ref-end'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
327
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
328 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
329 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
330 a [.5mm] type of number...."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
331 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
332 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
333
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
334 (defvar ispell-tib-ref-beginning "[[<]\\."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
335 "Regexp matching the beginning of a Tib reference.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
336
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
337 (defvar ispell-tib-ref-end "\\.[]>]"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
338 "Regexp matching the end of a Tib reference.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
339
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
340 (defcustom ispell-keep-choices-win t
75880
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
341 "*When non-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
342 This minimizes redisplay thrashing."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
343 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
344 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
345
32685
afd8474f34ae (ispell-mode-line-window-height-fudge):
Miles Bader <miles@gnu.org>
parents: 30954
diff changeset
346 (defcustom ispell-choices-win-default-height 2
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
347 "*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
348 Must be greater than 1."
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
349 :type 'integer
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
350 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
351
62156
12ab35f4126a (ispell-program-name): Try looking for "aspell" along exec-path,
Eli Zaretskii <eliz@gnu.org>
parents: 60985
diff changeset
352 (defcustom ispell-program-name
101232
f58b15c9942b Protect against declare-function undefined in xemacs.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100992
diff changeset
353 (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p)
f58b15c9942b Protect against declare-function undefined in xemacs.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100992
diff changeset
354 (locate-file "ispell" exec-path exec-suffixes 'file-executable-p)
f58b15c9942b Protect against declare-function undefined in xemacs.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100992
diff changeset
355 (locate-file "hunspell" exec-path exec-suffixes 'file-executable-p)
62156
12ab35f4126a (ispell-program-name): Try looking for "aspell" along exec-path,
Eli Zaretskii <eliz@gnu.org>
parents: 60985
diff changeset
356 "ispell")
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
357 "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
358 :type 'string
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
359 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
360
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
361 (defcustom ispell-alternate-dictionary
109161
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
362 (cond ((file-readable-p "/usr/dict/web2") "/usr/dict/web2")
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
363 ((file-readable-p "/usr/share/dict/web2") "/usr/share/dict/web2")
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
364 ((file-readable-p "/usr/dict/words") "/usr/dict/words")
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
365 ((file-readable-p "/usr/lib/dict/words") "/usr/lib/dict/words")
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
366 ((file-readable-p "/usr/share/dict/words") "/usr/share/dict/words")
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
367 ((file-readable-p "/usr/share/lib/dict/words")
38644
f1184d540c06 (ispell-alternate-dictionary): Add /usr/share/lib/dict/words, for Irix.
Eli Zaretskii <eliz@gnu.org>
parents: 38436
diff changeset
368 "/usr/share/lib/dict/words")
109161
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
369 ((file-readable-p "/sys/dict") "/sys/dict"))
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
370 "*Alternate plain word-list dictionary for spelling help."
24795
a7afe99e73cf (ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents: 24737
diff changeset
371 :type '(choice file (const :tag "None" nil))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
372 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
373
109161
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
374 (defcustom ispell-complete-word-dict nil
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
375 "*Plain word-list dictionary used for word completion if
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
376 different from `ispell-alternate-dictionary'."
24795
a7afe99e73cf (ispell-alternate-dictionary): Fix custom type.
Dave Love <fx@gnu.org>
parents: 24737
diff changeset
377 :type '(choice file (const :tag "None" nil))
17378
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
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
380 (defcustom ispell-message-dictionary-alist nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
381 "*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
382 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
383 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
384 DICTIONARY if `ispell-local-dictionary' is not buffer-local.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
385 E.g. you may use the following value:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
386 '((\"^Newsgroups:[ \\t]*de\\\\.\" . \"deutsch8\")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
387 (\"^To:[^\\n,]+\\\\.de[ \\t\\n,>]\" . \"deutsch8\"))"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
388 :type '(repeat (cons regexp string))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
389 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
390
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
391
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
392 (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
393 "*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
394 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
395 :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
396 :group 'ispell)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
397
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
398
79646
e1264c5f9e23 (ispell-grep-command): Use "grep" on MS-Windows and MS-DOS.
Eli Zaretskii <eliz@gnu.org>
parents: 78482
diff changeset
399 (defcustom ispell-grep-command
e1264c5f9e23 (ispell-grep-command): Use "grep" on MS-Windows and MS-DOS.
Eli Zaretskii <eliz@gnu.org>
parents: 78482
diff changeset
400 ;; MS-Windows/MS-DOS have `egrep' as a Unix shell script, so they
e1264c5f9e23 (ispell-grep-command): Use "grep" on MS-Windows and MS-DOS.
Eli Zaretskii <eliz@gnu.org>
parents: 78482
diff changeset
401 ;; cannot invoke it. Use "grep -E" instead (see ispell-grep-options
e1264c5f9e23 (ispell-grep-command): Use "grep" on MS-Windows and MS-DOS.
Eli Zaretskii <eliz@gnu.org>
parents: 78482
diff changeset
402 ;; below).
e1264c5f9e23 (ispell-grep-command): Use "grep" on MS-Windows and MS-DOS.
Eli Zaretskii <eliz@gnu.org>
parents: 78482
diff changeset
403 (if (memq system-type '(windows-nt ms-dos)) "grep" "egrep")
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
404 "Name of the grep command for search processes."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
405 :type 'string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
406 :group 'ispell)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
407
79646
e1264c5f9e23 (ispell-grep-command): Use "grep" on MS-Windows and MS-DOS.
Eli Zaretskii <eliz@gnu.org>
parents: 78482
diff changeset
408 (defcustom ispell-grep-options
e1264c5f9e23 (ispell-grep-command): Use "grep" on MS-Windows and MS-DOS.
Eli Zaretskii <eliz@gnu.org>
parents: 78482
diff changeset
409 (if (memq system-type '(windows-nt ms-dos)) "-Ei" "-i")
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
410 "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
411 Should probably be \"-i\" or \"-e\".
106840
5df8e547a422 Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
412 Some machines (like the NeXT) don't support \"-i\"."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
413 :type 'string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
414 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
415
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
416 (defcustom ispell-look-command
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
417 (cond ((file-exists-p "/bin/look") "/bin/look")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
418 ((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
419 ((file-exists-p "/usr/bin/look") "/usr/bin/look")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
420 (t "look"))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
421 "Name of the look command for search processes.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
422 This must be an absolute file name."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
423 :type 'file
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
424 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
425
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
426 (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
427 "*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
428 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
429 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
430 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
431
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
432 (defcustom ispell-have-new-look nil
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
433 "*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
434 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
435 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
436
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
437 (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
438 "String of command options for `ispell-look-command'."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
439 :type 'string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
440 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
441
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
442 (defcustom ispell-use-ptys-p nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
443 "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
444 When nil, Emacs uses pipes."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
445 :type 'boolean
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
446 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
447
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
448 (defcustom ispell-following-word nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
449 "*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
450 Otherwise `ispell-word' checks the preceding word."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
451 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
452 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
453
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
454 (defcustom ispell-help-in-bufferp nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
455 "*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
456 The following values are supported:
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
457 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
458 there for a couple of seconds.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
459 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
460 for a couple of seconds.
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
461 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
462 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
463 :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
464 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
465
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
466 (defcustom ispell-quietly nil
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
467 "*Non-nil means suppress messages in `ispell-word'."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
468 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
469 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
470
70814
6a91e8b1eea0 (ispell-format-word): Make this the alias for the following variable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70398
diff changeset
471 (defcustom ispell-format-word-function (function upcase)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
472 "*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
473 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
474 :type 'function
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
475 :group 'ispell)
70814
6a91e8b1eea0 (ispell-format-word): Make this the alias for the following variable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70398
diff changeset
476 (defvaralias 'ispell-format-word 'ispell-format-word-function)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
477
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
478 (defcustom ispell-use-framepop-p nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
479 "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
480 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
481 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
482 (and window-system (condition-case () (require 'framepop) (error nil)))"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
483 :type 'boolean
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
484 :group 'ispell)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
485
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
486 ;;;###autoload
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
487 (defcustom ispell-personal-dictionary nil
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
488 "*File name of your personal spelling dictionary, or nil.
97786
640b23759d43 Extend `ispell-personal-dictionary' doctring to aspell
Agustin Martin <agustin.martin@hispalinux.es>
parents: 94670
diff changeset
489 If nil, the default personal dictionary, (\"~/.ispell_DICTNAME\" for ispell or
640b23759d43 Extend `ispell-personal-dictionary' doctring to aspell
Agustin Martin <agustin.martin@hispalinux.es>
parents: 94670
diff changeset
490 \"~/.aspell.LANG.pws\" for aspell) is used, where DICTNAME is the name of your
640b23759d43 Extend `ispell-personal-dictionary' doctring to aspell
Agustin Martin <agustin.martin@hispalinux.es>
parents: 94670
diff changeset
491 default dictionary and LANG the two letter language code."
19828
fa6f38bb8ac1 (ispell-personal-dictionary): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19785
diff changeset
492 :type '(choice file
fa6f38bb8ac1 (ispell-personal-dictionary): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19785
diff changeset
493 (const :tag "default" nil))
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
494 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
495
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
496 (defcustom ispell-silently-savep nil
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
497 "*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
498 :type 'boolean
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
499 :group 'ispell)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
500
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
501 (defvar ispell-local-dictionary-overridden nil
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
502 "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
503 (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
504
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
505 (defcustom ispell-local-dictionary nil
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
506 "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
507 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
508 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
509 Dictionary names are defined in `ispell-local-dictionary-alist'
103564
dbc4954024d6 (ispell-local-dictionary): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 103360
diff changeset
510 and `ispell-dictionary-alist'.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
511
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
512 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
513 calling \\[ispell-change-dictionary] with that value. This variable
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
514 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
515 `ispell-dictionary-keyword' or the Local Variable syntax."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
516 :type '(choice string
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
517 (const :tag "default" nil))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
518 :group 'ispell)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
519 ;;;###autoload
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
520 (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
521
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
522 (make-variable-buffer-local 'ispell-local-dictionary)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
523
103360
4b98e52b12b1 ispell.el: Make `ispell-dictionary' customizable (#2555)
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103286
diff changeset
524 (defcustom ispell-dictionary nil
4b98e52b12b1 ispell.el: Make `ispell-dictionary' customizable (#2555)
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103286
diff changeset
525 "Default dictionary to use if `ispell-local-dictionary' is nil."
4b98e52b12b1 ispell.el: Make `ispell-dictionary' customizable (#2555)
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103286
diff changeset
526 :type '(choice string
4b98e52b12b1 ispell.el: Make `ispell-dictionary' customizable (#2555)
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103286
diff changeset
527 (const :tag "default" nil))
4b98e52b12b1 ispell.el: Make `ispell-dictionary' customizable (#2555)
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103286
diff changeset
528 :group 'ispell)
4b98e52b12b1 ispell.el: Make `ispell-dictionary' customizable (#2555)
Agustin Martin <agustin.martin@hispalinux.es>
parents: 103286
diff changeset
529
17378
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
530 (defcustom ispell-extra-args nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
531 "*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
532 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
533 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
534 for language-specific arguments."
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
535 :type '(repeat string)
30a3a2b1260a Use defcustom for user variables.
Richard M. Stallman <rms@gnu.org>
parents: 17143
diff changeset
536 :group 'ispell)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
537
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
538
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
539
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
540 (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
541 "*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
542 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
543 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
544 buffer's major mode."
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
545 :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
546 (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
547 :group 'ispell)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
548
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
549 (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
550
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
551
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
552 (defcustom ispell-local-dictionary-alist nil
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
553 "*List of local or customized dictionary definitions.
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
554 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
555
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
556 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
557 will need to make your changes in this variable, save, and then
73731
e33303152c03 (ispell, ispell-local-dictionary-alist, ispell-help): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 73080
diff changeset
558 re-start Emacs."
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
559 :type '(repeat (list (choice :tag "Dictionary"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
560 (string :tag "Dictionary name")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
561 (const :tag "default" nil))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
562 (regexp :tag "Case characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
563 (regexp :tag "Non case characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
564 (regexp :tag "Other characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
565 (boolean :tag "Many other characters")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
566 (repeat :tag "Ispell command line args"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
567 (string :tag "Arg"))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
568 (choice :tag "Extended character mode"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
569 (const "~tex") (const "~plaintex")
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
570 (const "~nroff") (const "~list")
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
571 (const "~latin1") (const "~latin3")
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
572 (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
573 (coding-system :tag "Coding System")))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
574 :group 'ispell)
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
575
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
576
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
577 (defvar ispell-dictionary-base-alist
99698
efc1b0dc2c12 (ispell-dictionary-base-alist): Adjust to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99217
diff changeset
578 '((nil
efc1b0dc2c12 (ispell-dictionary-base-alist): Adjust to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99217
diff changeset
579 ;; The default dictionary. It may be English.aff, or any other
efc1b0dc2c12 (ispell-dictionary-base-alist): Adjust to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99217
diff changeset
580 ;; dictionary depending on locale and such things. We should probably
efc1b0dc2c12 (ispell-dictionary-base-alist): Adjust to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99217
diff changeset
581 ;; ask ispell what dictionary it's using, but until we do that, let's
efc1b0dc2c12 (ispell-dictionary-base-alist): Adjust to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99217
diff changeset
582 ;; just use an approximate regexp.
efc1b0dc2c12 (ispell-dictionary-base-alist): Adjust to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99217
diff changeset
583 "[[:alpha:]]" "[^[:alpha:]]" "[']" nil ("-B") nil iso-8859-1)
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
584 ("american" ; Yankee English
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
585 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
586 ("brasileiro" ; Brazilian mode
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
587 "[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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
588 "[^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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
589 "[']" nil nil nil iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
590 ("british" ; British version
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
591 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
592 ("castellano" ; Spanish mode
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
593 "[A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
594 "[^A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
595 "[-]" nil ("-B") "~tex" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
596 ("castellano8" ; 8 bit Spanish mode
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
597 "[A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
598 "[^A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
599 "[-]" nil ("-B" "-d" "castellano") "~latin1" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
600 ("czech"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
601 "[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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
602 "[^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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
603 "" nil ("-B") nil iso-8859-2)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
604 ("dansk" ; Dansk.aff
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
605 "[A-Z\306\330\305a-z\346\370\345]" "[^A-Z\306\330\305a-z\346\370\345]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
606 "[']" nil ("-C") nil iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
607 ("deutsch" ; Deutsch.aff
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
608 "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
609 ("deutsch8"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
610 "[a-zA-Z\304\326\334\344\366\337\374]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
611 "[^a-zA-Z\304\326\334\344\366\337\374]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
612 "[']" t ("-C" "-d" "deutsch") "~latin1" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
613 ("english" ; make English explicitly selectable
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
614 "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
615 ("esperanto"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
616 "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
617 "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
618 "[-']" t ("-C") "~latin3" iso-8859-3)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
619 ("esperanto-tex"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
620 "[A-Za-z^\\]" "[^A-Za-z^\\]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
621 "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-3)
105722
07c46db1ec50 * textmodes/ispell.el (ispell-dictionary-base-alist): Add finnish
Chong Yidong <cyd@stupidchicken.com>
parents: 105715
diff changeset
622 ("finnish"
07c46db1ec50 * textmodes/ispell.el (ispell-dictionary-base-alist): Add finnish
Chong Yidong <cyd@stupidchicken.com>
parents: 105715
diff changeset
623 "[A-Za-z\345\344\366\305\304\326]"
07c46db1ec50 * textmodes/ispell.el (ispell-dictionary-base-alist): Add finnish
Chong Yidong <cyd@stupidchicken.com>
parents: 105715
diff changeset
624 "[^A-Za-z\345\344\366\305\304\326]"
07c46db1ec50 * textmodes/ispell.el (ispell-dictionary-base-alist): Add finnish
Chong Yidong <cyd@stupidchicken.com>
parents: 105715
diff changeset
625 "[:]" nil ("-C") "~list" iso-8859-1)
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
626 ("francais7"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
627 "[A-Za-z]" "[^A-Za-z]" "[`'^-]" t nil nil iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
628 ("francais" ; Francais.aff
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
629 "[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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
630 "[^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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
631 "[-'.@]" t nil "~list" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
632 ("francais-tex" ; Francais.aff
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
633 "[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\\]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
634 "[^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\\]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
635 "[-'^`\".@]" t nil "~tex" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
636 ("german" ; german.aff
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
637 "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
638 ("german8" ; german.aff
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
639 "[a-zA-Z\304\326\334\344\366\337\374]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
640 "[^a-zA-Z\304\326\334\344\366\337\374]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
641 "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
642 ("italiano" ; Italian.aff
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
643 "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
644 "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
645 "[-.]" nil ("-B" "-d" "italian") "~tex" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
646 ("nederlands" ; Nederlands.aff
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
647 "[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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
648 "[^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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
649 "[']" t ("-C") nil iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
650 ("nederlands8" ; Dutch8.aff
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
651 "[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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
652 "[^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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
653 "[']" t ("-C") nil iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
654 ("norsk" ; 8 bit Norwegian mode
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
655 "[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
656 "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
657 "[\"]" nil nil "~list" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
658 ("norsk7-tex" ; 7 bit Norwegian TeX mode
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
659 "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
660 "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
661 ("polish" ; Polish mode
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
662 "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
663 "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
664 "[.]" nil nil nil iso-8859-2)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
665 ("portugues" ; Portuguese mode
109009
812d563cc192 ispell.el: Fix portuguese casechars/not-casechars for missing '«®ª®'. (bug#6434).
Agustin martin <agustin.martin@hispalinux.es>
parents: 108538
diff changeset
666 "[a-zA-Z\301\302\307\311\323\340\341\342\351\352\355\363\343\347\372]"
812d563cc192 ispell.el: Fix portuguese casechars/not-casechars for missing '«®ª®'. (bug#6434).
Agustin martin <agustin.martin@hispalinux.es>
parents: 108538
diff changeset
667 "[^a-zA-Z\301\302\307\311\323\340\341\342\351\352\355\363\343\347\372]"
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
668 "[']" t ("-C") "~latin1" iso-8859-1)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
669 ("russian" ; Russian.aff (KOI8-R charset)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
670 "[\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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
671 "[^\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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
672 "" nil nil nil koi8-r)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
673 ("russianw" ; russianw.aff (CP1251 charset)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
674 "[\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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
675 "[^\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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
676 "" nil nil nil windows-1251)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
677 ("slovak" ; Slovakian
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
678 "[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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
679 "[^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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
680 "" nil ("-B") nil iso-8859-2)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
681 ("slovenian" ; Slovenian
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
682 "[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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
683 "[^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]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
684 "" nil ("-B" "-d" "slovenian") nil iso-8859-2)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
685 ("svenska" ; Swedish mode
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
686 "[A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
687 "[^A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
688 "[']" nil ("-C") "~list" iso-8859-1))
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
689 "Base value for `ispell-dictionary-alist'.")
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
690
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
691 (defvar ispell-dictionary-alist nil
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
692 "An alist of dictionaries and their associated parameters.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
693
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
694 Each element of this list is also a list:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
695
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
696 \(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
697 ISPELL-ARGS EXTENDED-CHARACTER-MODE CHARACTER-SET\)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
698
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
699 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
700 nil means the default dictionary.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
701
75880
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
702 CASECHARS is a regular expression of valid characters that comprise a word.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
703
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
704 NOT-CASECHARS is the opposite regexp of CASECHARS.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
705
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
706 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
707 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
708 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
709 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
710 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
711 \"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
712 \"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
713 If you want OTHERCHARS to be empty, use the empty string.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
714 Hint: regexp syntax requires the hyphen to be declared first here.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
715
75882
67f0213ebfd7 (ispell-dictionary-alist): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 75880
diff changeset
716 CASECHARS, NOT-CASECHARS, and OTHERCHARS must be unibyte strings
60182
a8e43a2ba867 (ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 59907
diff changeset
717 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
718 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
719 `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
720 for non-ASCII bytes.
a8e43a2ba867 (ispell-dictionary-alist): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 59907
diff changeset
721
19183
aaf5a3f7a2bd (ispell-dictionary-alist): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 17955
diff changeset
722 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
723 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
724 single word.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
725
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
726 ISPELL-ARGS is a list of additional arguments passed to the ispell
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
727 subprocess.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
728
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
729 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
730 have been configured in an Ispell affix file. (For example, umlauts
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
731 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
732 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
733 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
734 but the dictionary can control the extended character mode.
106840
5df8e547a422 Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
735 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
736 `ispell-parsing-keyword' for details on this.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
737
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
738 CHARACTER-SET used for languages with multibyte characters.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
739
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
740 Note that the CASECHARS and OTHERCHARS slots of the alist should
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
741 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
742 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
743
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
744 (defvar ispell-really-aspell nil) ; Non-nil if we can use aspell extensions.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
745 (defvar ispell-really-hunspell nil) ; Non-nil if we can use hunspell extensions.
100987
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
746 (defvar ispell-encoding8-command nil
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
747 "Command line option prefix to select UTF-8 if supported, nil otherwise.
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
748 If UTF-8 if supported by spellchecker and is selectable from the command line
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
749 this variable will contain \"--encoding=\" for aspell and \"-i \" for hunspell,
106840
5df8e547a422 Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
750 so UTF-8 or other mime charsets can be selected. That will be set for hunspell
100987
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
751 >=1.1.6 or aspell >= 0.60 in `ispell-check-version'.
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
752
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
753 For aspell non-nil means to try to automatically find aspell dictionaries.
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
754 Earlier aspell versions do not consistently support UTF-8. Handling
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
755 this would require some extra guessing in `ispell-aspell-find-dictionary'.")
56932
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
756
65571
9cf0204bd600 (ispell-aspell-supports-utf8): New variable.
Eli Zaretskii <eliz@gnu.org>
parents: 65433
diff changeset
757 (defvar ispell-aspell-supports-utf8 nil
106840
5df8e547a422 Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
758 "Non nil if aspell has consistent command line UTF-8 support. Obsolete.
100987
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
759 ispell.el and flyspell.el will use for this purpose the more generic
106840
5df8e547a422 Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
760 variable `ispell-encoding8-command' for both aspell and hunspell. Is left
100987
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
761 here just for backwards compatibility.")
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
762
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
763 (make-obsolete-variable 'ispell-aspell-supports-utf8
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
764 'ispell-encoding8-command "23.1")
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
765
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
766
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
767 ;;; **********************************************************************
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
768 ;;; 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
769 ;;; **********************************************************************
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
770
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
771
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
772
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
773 ;; The version must be 3.1 or greater for this version of ispell.el
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
774 ;; There is an incompatibility between version 3.1.12 and lower versions.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
775 (defconst ispell-required-version '(3 1 12)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
776 "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
777 (defvar ispell-offset -1
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
778 "Offset that maps protocol differences between ispell 3.1 versions.")
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
779
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
780 (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
781
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
782
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
783 (defun ispell-check-version (&optional interactivep)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
784 "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
785 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
786 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
787 ;; 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
788 ;; 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
789 ;; 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
790 ;; 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
791 ;; 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
792 ;; 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
793 ;; themselves on startup.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
794 (interactive "p")
104681
91afee51b252 * textmodes/ispell.el (ispell-check-version, ispell-send-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104002
diff changeset
795 (let ((default-directory (or (and (boundp 'temporary-file-directory)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
796 temporary-file-directory)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
797 default-directory))
100616
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
798 result status ispell-program-version)
100920
cd88b4306232 textmodes/ispell.el (ispell-check-version): Use (with-temp-buffer)
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100908
diff changeset
799
cd88b4306232 textmodes/ispell.el (ispell-check-version): Use (with-temp-buffer)
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100908
diff changeset
800 (with-temp-buffer
76633
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
801 (setq status (ispell-call-process
34632
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
802 ispell-program-name nil t nil
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
803 ;; aspell doesn't accept the -vv switch.
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
804 (let ((case-fold-search
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
805 (memq system-type '(ms-dos windows-nt)))
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
806 (speller
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
807 (file-name-nondirectory ispell-program-name)))
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
808 ;; Assume anything that isn't `aspell' is Ispell.
a0dab8c91962 (check-ispell-version): If
Eli Zaretskii <eliz@gnu.org>
parents: 34579
diff changeset
809 (if (string-match "\\`aspell" speller) "-v" "-vv"))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
810 (goto-char (point-min))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
811 (if interactivep
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
812 ;; report version information of ispell and ispell.el
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
813 (progn
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
814 (end-of-line)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
815 (setq result (concat (buffer-substring-no-properties (point-min)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
816 (point))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
817 ", "
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
818 ispell-version))
65583
703495630901 Message format spec fixes (2)
Deepak Goel <deego@gnufans.org>
parents: 65571
diff changeset
819 (message "%s" result))
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
820 ;; return library directory.
34131
63a3259e1b50 (check-ispell-version): Don't use match-beginning
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33353
diff changeset
821 (if (re-search-forward "LIBDIR = \\\"\\([^ \t\n]*\\)\\\"" nil t)
104681
91afee51b252 * textmodes/ispell.el (ispell-check-version, ispell-send-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104002
diff changeset
822 (setq result (match-string 1))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
823 (goto-char (point-min))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
824 (if (not (memq status '(0 nil)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
825 (error "%s exited with %s %s" ispell-program-name
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
826 (if (stringp status) "signal" "code") status))
100616
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
827
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
828 ;; Get relevant version strings. Only xx.yy.... format works well
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
829 (let (case-fold-search)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
830 (setq ispell-program-version
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
831 (and (search-forward-regexp "\\([0-9]+\\.[0-9\\.]+\\)" nil t)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
832 (match-string 1)))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
833
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
834 ;; Make sure these variables are (re-)initialized to the default value
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
835 (setq ispell-really-aspell nil
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
836 ispell-aspell-supports-utf8 nil
100987
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
837 ispell-really-hunspell nil
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
838 ispell-encoding8-command nil)
100616
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
839
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
840 (goto-char (point-min))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
841 (or (setq ispell-really-aspell
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
842 (and (search-forward-regexp
103286
b05973aa4a3f * textmodes/ispell.el (ispell-check-version): Handle dashes in
Chong Yidong <cyd@stupidchicken.com>
parents: 102529
diff changeset
843 "(but really Aspell \\([0-9]+\\.[0-9\\.-]+\\)?)" nil t)
100616
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
844 (match-string 1)))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
845 (setq ispell-really-hunspell
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
846 (and (search-forward-regexp
104681
91afee51b252 * textmodes/ispell.el (ispell-check-version, ispell-send-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104002
diff changeset
847 "(but really Hunspell \\([0-9]+\\.[0-9\\.-]+\\)?)"
91afee51b252 * textmodes/ispell.el (ispell-check-version, ispell-send-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104002
diff changeset
848 nil t)
100616
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
849 (match-string 1)))))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
850
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
851 (let ((aspell-minver "0.50")
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
852 (aspell8-minver "0.60")
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
853 (ispell0-minver "3.1.0")
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
854 (ispell-minver "3.1.12")
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
855 (hunspell8-minver "1.1.6"))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
856
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
857 (if (ispell-check-minver ispell0-minver ispell-program-version)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
858 (or (ispell-check-minver ispell-minver ispell-program-version)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
859 (setq ispell-offset 0))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
860 (error "%s release %s or greater is required"
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
861 ispell-program-name
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
862 ispell-minver))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
863
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
864 (cond
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
865 (ispell-really-aspell
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
866 (if (ispell-check-minver aspell-minver ispell-really-aspell)
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
867 (if (ispell-check-minver aspell8-minver ispell-really-aspell)
100987
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
868 (progn
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
869 (setq ispell-aspell-supports-utf8 t)
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
870 (setq ispell-encoding8-command "--encoding=")))
100616
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
871 (setq ispell-really-aspell nil)))
d97232b983fb * textmodes/ispell.el (ispell-check-minver): New function.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100500
diff changeset
872 (ispell-really-hunspell
100987
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
873 (if (ispell-check-minver hunspell8-minver ispell-really-hunspell)
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
874 (setq ispell-encoding8-command "-i ")
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
875 (setq ispell-really-hunspell nil))))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
876 result))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
877
76633
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
878 (defun ispell-call-process (&rest args)
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
879 "Like `call-process' but defend against bad `default-directory'."
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
880 (let ((default-directory default-directory))
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
881 (unless (and (file-directory-p default-directory)
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
882 (file-readable-p default-directory))
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
883 (setq default-directory (expand-file-name "~/")))
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
884 (apply 'call-process args)))
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
885
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
886 (defun ispell-call-process-region (&rest args)
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
887 "Like `call-process-region' but defend against bad `default-directory'."
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
888 (let ((default-directory default-directory))
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
889 (unless (and (file-directory-p default-directory)
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
890 (file-readable-p default-directory))
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
891 (setq default-directory (expand-file-name "~/")))
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
892 (apply 'call-process-region args)))
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
893
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
894
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
895
104681
91afee51b252 * textmodes/ispell.el (ispell-check-version, ispell-send-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104002
diff changeset
896 ;; The preparation of the menu bar menu must be autoloaded
91afee51b252 * textmodes/ispell.el (ispell-check-version, ispell-send-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104002
diff changeset
897 ;; because otherwise this file gets autoloaded every time Emacs starts
91afee51b252 * textmodes/ispell.el (ispell-check-version, ispell-send-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104002
diff changeset
898 ;; so that it can set up the menus and determine keyboard equivalents.
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
899
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
900 ;;;###autoload
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
901 (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
902 ;;; 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
903 (setq ispell-menu-map nil)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
904
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
905 ;;;###autoload
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
906 (defvar ispell-menu-xemacs nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
907 "Spelling menu for XEmacs.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
908 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
909 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
910
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
911 ;; Break out XEmacs menu and split into several calls to avoid having
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
912 ;; 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
913
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
914 ;;; Set up dictionary
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
915 ;;;###autoload
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
916 (defvar ispell-menu-map-needed
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
917 ;; 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
918 (and (not ispell-menu-map)
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
919 (not (featurep 'xemacs))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
920 'reload))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
921
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
922 (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
923 (ispell-check-version)
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
924 (error nil))
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
925 "Directory where ispell dictionaries reside.")
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
926
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
927 (defvar ispell-process nil
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
928 "The process object for Ispell.")
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
929
71289
95f5febb2bb5 (ispell-kill-ispell): If ispell has been
Kim F. Storm <storm@cua.dk>
parents: 70814
diff changeset
930 (defvar ispell-async-processp (and (fboundp 'delete-process)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
931 (fboundp 'process-send-string)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
932 (fboundp 'accept-process-output)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
933 ;;(fboundp 'start-process)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
934 ;;(fboundp 'set-process-filter)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
935 ;;(fboundp 'process-kill-without-query)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
936 )
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
937 "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
938
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
939 ;; Make ispell.el work better with aspell.
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
940
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
941 (defvar ispell-aspell-dictionary-alist nil
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
942 "An alist of parsed aspell dicts and associated parameters.
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
943 Internal use.")
65670
dac12c967d98 (ispell-maybe-find-aspell-dictionaries): New function, code extracted from
Eli Zaretskii <eliz@gnu.org>
parents: 65583
diff changeset
944
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
945 (defun ispell-find-aspell-dictionaries ()
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
946 "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'."
101232
f58b15c9942b Protect against declare-function undefined in xemacs.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100992
diff changeset
947 (unless (and ispell-really-aspell ispell-encoding8-command)
105170
f8ba8d6fd250 Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents: 105007
diff changeset
948 (error "This function only works with aspell >= 0.60"))
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
949 (let* ((dictionaries
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
950 (split-string
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
951 (with-temp-buffer
76633
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
952 (ispell-call-process ispell-program-name nil t nil "dicts")
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
953 (buffer-string))))
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
954 ;; Search for the named dictionaries.
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
955 (found
73731
e33303152c03 (ispell, ispell-local-dictionary-alist, ispell-help): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 73080
diff changeset
956 (delq nil
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
957 (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
958 ;; 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
959 ;; definitions.
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
960 (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
961 ;; Merge into FOUND any elements from the standard ispell-dictionary-alist
73731
e33303152c03 (ispell, ispell-local-dictionary-alist, ispell-help): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 73080
diff changeset
962 ;; which have no element in FOUND at all.
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
963 (dolist (dict ispell-dictionary-alist)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
964 (unless (assoc (car dict) found)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
965 (setq found (nconc found (list dict)))))
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
966 (setq ispell-aspell-dictionary-alist found)
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
967 ;; Add a default entry
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
968 (let ((default-dict
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
969 '(nil "[[:alpha:]]" "[^[:alpha:]]" "[']" nil ("-B") nil utf-8)))
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
970 (push default-dict ispell-aspell-dictionary-alist))))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
971
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
972 (defvar ispell-aspell-data-dir nil
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
973 "Data directory of Aspell.")
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
974
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
975 (defvar ispell-aspell-dict-dir nil
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
976 "Dictionary directory of Aspell.")
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
977
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
978 (defun ispell-get-aspell-config-value (key)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
979 "Return value of Aspell configuration option KEY.
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
980 Assumes that value contains no whitespace."
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
981 (with-temp-buffer
76633
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
982 (ispell-call-process ispell-program-name nil t nil "config" key)
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
983 (car (split-string (buffer-string)))))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
984
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
985 (defun ispell-aspell-find-dictionary (dict-name)
111023
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
986 "For aspell dictionary DICT-NAME, return a list of parameters if an
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
987 associated data file is found or nil otherwise. List format is
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
988 that of `ispell-dictionary-base-alist' elements."
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
989 ;; Make sure `ispell-aspell-data-dir' is defined
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
990 (or ispell-aspell-data-dir
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
991 (setq ispell-aspell-data-dir
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
992 (ispell-get-aspell-config-value "data-dir")))
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
993 ;; Try finding associated datafile
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
994 (let* ((datafile1
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
995 (concat ispell-aspell-data-dir "/"
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
996 ;; Strip out variant, country code, etc.
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
997 (and (string-match "^[[:alpha:]]+" dict-name)
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
998 (match-string 0 dict-name)) ".dat"))
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
999 (datafile2
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1000 (concat ispell-aspell-data-dir "/"
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1001 ;; Strip out anything but xx_YY.
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1002 (and (string-match "^[[:alpha:]_]+" dict-name)
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1003 (match-string 0 dict-name)) ".dat"))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1004 (data-file
111023
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1005 (if (file-readable-p datafile1)
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1006 datafile1
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1007 (if (file-readable-p datafile2)
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1008 datafile2)))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1009 otherchars)
111023
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1010
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1011 (if data-file
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1012 (with-temp-buffer
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1013 (insert-file-contents data-file)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1014 ;; 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
1015 (when (search-forward-regexp "^special" nil t)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1016 (let ((specials (split-string
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1017 (buffer-substring (point)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1018 (progn (end-of-line) (point))))))
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1019 ;; The line looks like: special ' -** - -** . -** : -*-
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1020 ;; -** means that this character
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1021 ;; - doesn't appear at word start
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1022 ;; * 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
1023 ;; * may appear at word end
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1024 ;; `otherchars' is about the middle case.
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1025 (while specials
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1026 (when (eq (aref (cadr specials) 1) ?*)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1027 (push (car specials) otherchars))
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1028 (setq specials (cddr specials)))))
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1029 (list dict-name
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1030 "[[:alpha:]]"
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1031 "[^[:alpha:]]"
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1032 (regexp-opt otherchars)
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1033 t ; We can't tell, so set this to t
86952
583c3d4f0b79 Agustin Martin <agustin.martin at hispalinux.es>
Glenn Morris <rgm@gnu.org>
parents: 86242
diff changeset
1034 (list "-d" dict-name)
66343
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1035 nil ; aspell doesn't support this
b105e56fe1df (ispell-local-dictionary-overridden): Fix the
Richard M. Stallman <rms@gnu.org>
parents: 65943
diff changeset
1036 ;; 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
1037 ;; 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
1038 ;; just don't pass words to spellcheck as arguments...
111023
a59302c4ca9e ispell.el (ispell-aspell-find-dictionary): Fix aspell data file search (bug#7230).
Agustin Martin <agustin.martin@hispalinux.es>
parents: 110445
diff changeset
1039 'utf-8)))))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1040
69395
973779d570da (ispell-find-aspell-dictionaries): Add aliases before merging elements from the
Eli Zaretskii <eliz@gnu.org>
parents: 69394
diff changeset
1041 (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
1042 "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
1043 Return the new dictionary alist."
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1044 (let ((aliases
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1045 (file-expand-wildcards
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1046 (concat (or ispell-aspell-dict-dir
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1047 (setq ispell-aspell-dict-dir
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1048 (ispell-get-aspell-config-value "dict-dir")))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1049 "/*.alias"))))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1050 (dolist (alias-file aliases)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1051 (with-temp-buffer
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1052 (insert-file-contents alias-file)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1053 ;; 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
1054 (when (search-forward-regexp "^add \\([^.]+\\)\\.multi" nil t)
65262
330e799da016 (mail-yank-prefix): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 64965
diff changeset
1055 (let* ((aliasname (file-name-sans-extension
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1056 (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
1057 (already-exists-p (assoc aliasname alist))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1058 (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
1059 (realdict (assoc realname alist)))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1060 (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
1061 (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
1062 alist))
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1063
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1064 ;; Set params according to the selected spellchecker
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1065
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1066 (defvar ispell-last-program-name nil
106840
5df8e547a422 Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
1067 "Last value of `ispell-program-name'. Internal use.")
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1068
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1069 (defvar ispell-initialize-spellchecker-hook nil
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1070 "Normal hook run on spellchecker initialization.
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1071 This hook is run when a spellchecker is used for the first
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1072 time, before `ispell-dictionary-alist' is set. It is intended for
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1073 sysadmins to override entries in `ispell-dictionary-base-alist'
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1074 by putting those overrides in `ispell-base-dicts-override-alist', which is
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1075 a dynamically scoped var with same format as `ispell-dictionary-alist'.
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1076 This alist will not override the auto-detected values (e.g. if a recent
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1077 aspell is used along with Emacs).")
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1078
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1079 (defun ispell-set-spellchecker-params ()
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1080 "Initialize some spellchecker parameters when changed or first used."
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1081 (unless (eq ispell-last-program-name ispell-program-name)
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1082 (setq ispell-last-program-name ispell-program-name)
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1083 (ispell-kill-ispell t)
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1084 (if (and (condition-case ()
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1085 (progn
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1086 (setq ispell-library-directory (ispell-check-version))
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1087 t)
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1088 (error nil))
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1089 ispell-really-aspell
100987
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
1090 ispell-encoding8-command
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1091 ;; XEmacs does not like [:alpha:] regexps.
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1092 (string-match "^[[:alpha:]]+$" "abcde"))
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1093 (unless ispell-aspell-dictionary-alist
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1094 (ispell-find-aspell-dictionaries)))
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1095
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1096 ;; Substitute ispell-dictionary-alist with the list of dictionaries
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1097 ;; corresponding to the given spellchecker. If a recent aspell, use
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1098 ;; the list of really installed dictionaries and add to it elements
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1099 ;; of the original list that are not present there. Allow distro info.
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1100 (let ((found-dicts-alist
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1101 (if (and ispell-really-aspell
100987
34edfe1ce294 ispell.el (ispell-encoding8-command): New variable
Agustin Martin <agustin.martin@hispalinux.es>
parents: 100969
diff changeset
1102 ispell-encoding8-command)
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1103 ispell-aspell-dictionary-alist
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1104 nil))
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1105 ispell-base-dicts-override-alist ; Override only base-dicts-alist
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1106 all-dicts-alist)
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1107
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1108 (run-hooks 'ispell-initialize-spellchecker-hook)
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1109
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1110 ;; Add dicts to ``ispell-dictionary-alist'' unless already present.
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1111 (dolist (dict (append found-dicts-alist
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1112 ispell-base-dicts-override-alist
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1113 ispell-dictionary-base-alist))
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1114 (unless (assoc (car dict) all-dicts-alist)
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1115 (add-to-list 'all-dicts-alist dict)))
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1116 (setq ispell-dictionary-alist all-dicts-alist))))
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1117
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1118
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1119 (defun ispell-valid-dictionary-list ()
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
1120 "Return a list of valid dictionaries.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1121 The variable `ispell-library-directory' defines the library location."
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1122 ;; Initialize variables and dictionaries alists for desired spellchecker.
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1123 ;; Make sure ispell.el is loaded to avoid some autoload loops in XEmacs
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1124 ;; (and may be others)
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1125 (if (featurep 'ispell)
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1126 (ispell-set-spellchecker-params))
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1127
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1128 (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
1129 (dict-list (cons "default" nil))
110265
737d37e262a1 textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110263
diff changeset
1130 name dict-bname)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1131 (dolist (dict dicts)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1132 (setq name (car dict)
110265
737d37e262a1 textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110263
diff changeset
1133 dict-bname (or (car (cdr (member "-d" (nth 5 dict))))
737d37e262a1 textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110263
diff changeset
1134 name))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1135 ;; 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
1136 (if (and
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1137 name
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1138 ;; For Aspell, we already know which dictionaries exist.
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1139 (or ispell-really-aspell
110265
737d37e262a1 textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110263
diff changeset
1140 ;; Include all dictionaries if lib directory not known.
737d37e262a1 textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110263
diff changeset
1141 ;; Same for Hunspell, where ispell-library-directory is nil.
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1142 (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
1143 (file-exists-p (concat ispell-library-directory
110265
737d37e262a1 textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110263
diff changeset
1144 "/" dict-bname ".hash"))
737d37e262a1 textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110263
diff changeset
1145 (file-exists-p (concat ispell-library-directory
737d37e262a1 textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110263
diff changeset
1146 "/" dict-bname ".has"))))
737d37e262a1 textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110263
diff changeset
1147 (push name dict-list)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1148 dict-list))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1149
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1150 ;;; 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
1151 ;;;###autoload
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
1152 (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
1153 (progn
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1154 (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
1155 (define-key ispell-menu-map [ispell-change-dictionary]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1156 `(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1157 :help ,(purecopy "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
1158 (define-key ispell-menu-map [ispell-kill-ispell]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1159 `(menu-item ,(purecopy "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
1160 :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
1161 (eq (ispell-process-status) 'run))
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1162 :help ,(purecopy "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
1163 (define-key ispell-menu-map [ispell-pdict-save]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1164 `(menu-item ,(purecopy "Save Dictionary")
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1165 (lambda () (interactive) (ispell-pdict-save t t))
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1166 :help ,(purecopy "Save personal dictionary")))
43383
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1167 (define-key ispell-menu-map [ispell-customize]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1168 `(menu-item ,(purecopy "Customize...")
43383
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1169 (lambda () (interactive) (customize-group 'ispell))
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1170 :help ,(purecopy "Customize spell checking options")))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1171 (define-key ispell-menu-map [ispell-help]
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1172 ;; use (x-popup-menu last-nonmenu-event(list "" ispell-help-list)) ?
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1173 `(menu-item ,(purecopy "Help")
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1174 (lambda () (interactive) (describe-function 'ispell-help))
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1175 :help ,(purecopy "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
1176 (define-key ispell-menu-map [flyspell-mode]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1177 `(menu-item ,(purecopy "Automatic spell checking (Flyspell)")
43383
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 42889
diff changeset
1178 flyspell-mode
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1179 :help ,(purecopy "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
1180 :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
1181 (define-key ispell-menu-map [ispell-complete-word]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1182 `(menu-item ,(purecopy "Complete Word") ispell-complete-word
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1183 :help ,(purecopy "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
1184 (define-key ispell-menu-map [ispell-complete-word-interior-frag]
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1185 `(menu-item ,(purecopy "Complete Word Fragment")
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1186 ispell-complete-word-interior-frag
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1187 :help ,(purecopy "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
1188
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
1189 ;;;###autoload
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
1190 (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
1191 (progn
e6e305453f19 (ispell-command-loop): C-g should be like X, not q.
Richard M. Stallman <rms@gnu.org>
parents: 7840
diff changeset
1192 (define-key ispell-menu-map [ispell-continue]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1193 `(menu-item ,(purecopy "Continue Spell-Checking") ispell-continue
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1194 :enable (and (boundp 'ispell-region-end)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1195 (marker-position ispell-region-end)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1196 (equal (marker-buffer ispell-region-end)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1197 (current-buffer)))
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1198 :help ,(purecopy "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
1199 (define-key ispell-menu-map [ispell-word]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1200 `(menu-item ,(purecopy "Spell-Check Word") ispell-word
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1201 :help ,(purecopy "Spell-check word at cursor")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1202 (define-key ispell-menu-map [ispell-comments-and-strings]
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1203 `(menu-item ,(purecopy "Spell-Check Comments")
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1204 ispell-comments-and-strings
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1205 :help ,(purecopy "Spell-check only comments and strings")))))
8725
e4e6dc1e1be8 Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 8676
diff changeset
1206
12277
e03c2446f198 Reinstalled autoloads from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 12260
diff changeset
1207 ;;;###autoload
45585
13b4751a1413 (ispell-library-directory): Renamed from ispell-library-path.
Richard M. Stallman <rms@gnu.org>
parents: 43383
diff changeset
1208 (if ispell-menu-map-needed
8725
e4e6dc1e1be8 Further split the Ispell menu autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 8676
diff changeset
1209 (progn
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1210 (define-key ispell-menu-map [ispell-region]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1211 `(menu-item ,(purecopy "Spell-Check Region") ispell-region
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1212 :enable mark-active
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1213 :help ,(purecopy "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
1214 (define-key ispell-menu-map [ispell-message]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1215 `(menu-item ,(purecopy "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
1216 :visible (eq major-mode 'mail-mode)
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1217 :help ,(purecopy "Skip headers and included message text")))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1218 (define-key ispell-menu-map [ispell-buffer]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1219 `(menu-item ,(purecopy "Spell-Check Buffer") ispell-buffer
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105643
diff changeset
1220 :help ,(purecopy "Check spelling of selected buffer")))
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1221 ;;(put 'ispell-region 'menu-enable 'mark-active)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1222 (fset 'ispell-menu-map (symbol-value 'ispell-menu-map))))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1223
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1224 ;;; XEmacs versions 19 & 20
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
1225 (if (and (featurep 'xemacs)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1226 (featurep 'menubar)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1227 ;;(null ispell-menu-xemacs)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1228 (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
1229 (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
1230 (reverse (ispell-valid-dictionary-list))))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1231 (current-menubar (or current-menubar default-menubar))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1232 (menu
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1233 '(["Help" (describe-function 'ispell-help) t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1234 ;;["Help" (popup-menu ispell-help-list) t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1235 ["Check Message" ispell-message t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1236 ["Check Buffer" ispell-buffer t]
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1237 ["Check Comments" ispell-comments-and-strings t]
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1238 ["Check Word" ispell-word t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1239 ["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
1240 ["Continue Check" ispell-continue t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1241 ["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
1242 ["Complete Word" ispell-complete-word t]
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1243 ["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
1244 ["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
1245 ;; 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
1246 ;;["flyspell" flyspell-mode
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1247 ;; :style toggle :selected flyspell-mode ]
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1248 "-"
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1249 ["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
1250 ["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
1251 (if (null dicts)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1252 (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
1253 (dolist (name dicts)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1254 (setq menu (append menu
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1255 (list
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1256 (vector
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1257 (concat "Select " (capitalize name))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1258 (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
1259 t)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1260 (setq ispell-menu-xemacs menu)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1261 (if current-menubar
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1262 (progn
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1263 (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
1264 (progn
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1265 ;; XEmacs 21.2
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1266 (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
1267 (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
1268 ;; previous
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1269 (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
1270 (add-menu '("Edit") "Spell" ispell-menu-xemacs))))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1271
86242
aab1a93c03ca * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85378
diff changeset
1272 (defalias 'ispell-int-char
aab1a93c03ca * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85378
diff changeset
1273 ;; Allow incrementing characters as integers in XEmacs 20
aab1a93c03ca * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85378
diff changeset
1274 (if (and (featurep 'xemacs)
aab1a93c03ca * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85378
diff changeset
1275 (fboundp 'int-char))
aab1a93c03ca * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85378
diff changeset
1276 'int-char
aab1a93c03ca * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85378
diff changeset
1277 ;; Emacs and XEmacs 19 or earlier
aab1a93c03ca * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85378
diff changeset
1278 'identity))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1279
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1280
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1281 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1282
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1283 (defvar ispell-current-dictionary nil
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1284 "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
1285 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
1286 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
1287
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
1288 (defvar ispell-current-personal-dictionary nil
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
1289 "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
1290 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
1291
19644
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
1292 (defun ispell-decode-string (str)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1293 "Decodes multibyte character strings.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1294 Protects against bogus binding of `enable-multibyte-characters' in XEmacs."
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1295 ;; FIXME: enable-multibyte-characters is read-only, so bogus bindings are
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
1296 ;; really nasty (they signal an error in Emacs): Who does that? --Stef
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
1297 (if (and (or (featurep 'xemacs)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1298 (and (boundp 'enable-multibyte-characters)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1299 enable-multibyte-characters))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1300 (fboundp 'decode-coding-string)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1301 (ispell-get-coding-system))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1302 (decode-coding-string str (ispell-get-coding-system))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1303 str))
19644
f0c278dad88e (ispell-region): Take acount of the fact that `ispell'
Kenichi Handa <handa@m17n.org>
parents: 19183
diff changeset
1304
90076
7feda13f67b6 These changes are to fix the code merged
Kenichi Handa <handa@m17n.org>
parents: 90072
diff changeset
1305 ;; Return a string decoded from Nth element of the current dictionary.
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1306 (defun ispell-get-decoded-string (n)
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
1307 "Get the decoded string in slot N of the descriptor of the current dict."
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1308 (let* ((slot (or
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1309 (assoc ispell-current-dictionary ispell-local-dictionary-alist)
105643
062d17ee6c05 Jari Aalto <jari.aalto at cante.net>
Glenn Morris <rgm@gnu.org>
parents: 105170
diff changeset
1310 (assoc ispell-current-dictionary ispell-dictionary-alist)
062d17ee6c05 Jari Aalto <jari.aalto at cante.net>
Glenn Morris <rgm@gnu.org>
parents: 105170
diff changeset
1311 (error "No match for the current dictionary")))
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1312 (str (nth n slot)))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1313 (when (and (> (length str) 0)
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1314 (not (multibyte-string-p str)))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1315 (setq str (ispell-decode-string str))
90076
7feda13f67b6 These changes are to fix the code merged
Kenichi Handa <handa@m17n.org>
parents: 90072
diff changeset
1316 (or (multibyte-string-p str)
94630
2be356624ede (ispell-get-decoded-string): Remove no-op
Agustin Martin <agustin.martin@hispalinux.es>
parents: 94382
diff changeset
1317 (setq str (string-to-multibyte str))))
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1318 str))
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1319
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1320 (defun ispell-get-casechars ()
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1321 (ispell-get-decoded-string 1))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1322 (defun ispell-get-not-casechars ()
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1323 (ispell-get-decoded-string 2))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1324 (defun ispell-get-otherchars ()
59510
13bdf84b5df8 (ispell-unified-chars-table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 59064
diff changeset
1325 (ispell-get-decoded-string 3))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1326 (defun ispell-get-many-otherchars-p ()
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1327 (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
1328 (assoc ispell-current-dictionary ispell-dictionary-alist))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1329 (defun ispell-get-ispell-args ()
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1330 (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
1331 (assoc ispell-current-dictionary ispell-dictionary-alist))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1332 (defun ispell-get-extended-character-mode ()
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1333 (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
1334 (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
1335 (defun ispell-get-coding-system ()
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1336 (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
1337 (assoc ispell-current-dictionary ispell-dictionary-alist))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1338
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1339
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1340 (defvar ispell-pdict-modified-p nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1341 "Non-nil means personal dictionary has modifications to be saved.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1342
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1343 ;;; 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
1344 ;;; When non-nil, the spell session is terminated.
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1345 ;;; 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
1346 (defvar ispell-quit nil)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1347
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1348 (defvar ispell-process-directory nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1349 "The directory where `ispell-process' was started.")
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1350
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1351 (defvar ispell-filter nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1352 "Output filter from piped calls to Ispell.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1353
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1354 (defvar ispell-filter-continue nil
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1355 "Control variable for Ispell filter function.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1356
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1357 (defvar ispell-output-buffer nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1358 "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
1359
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1360 (defvar ispell-session-buffer nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1361 "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
1362
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1363 (defvar ispell-cmd-args nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1364 "Command-line arguments to pass to a synchronous Ispell subprocess.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1365
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1366 (defvar ispell-query-replace-marker (make-marker)
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1367 "Marker for `query-replace' processing.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1368
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1369 (defvar ispell-recursive-edit-marker (make-marker)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1370 "Marker for return point from recursive edit.")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1371
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1372 (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
1373 "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
1374 Set to the MIME boundary locations when checking messages.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1375
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1376 (defconst ispell-choices-buffer "*Choices*")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1377
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1378 (defvar ispell-overlay nil "Overlay variable for Ispell highlighting.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1379
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1380 ;;; *** Buffer Local Definitions ***
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1381
49599
5ade352e8d1c Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49535
diff changeset
1382 (defconst ispell-words-keyword "LocalWords: "
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1383 "The keyword for local oddly-spelled words to accept.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1384 The keyword will be followed by any number of local word spellings.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1385 There can be multiple of these keywords in the file.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1386
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1387 (defconst ispell-dictionary-keyword "Local IspellDict: "
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1388 "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
1389 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
1390 `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
1391 When multiple occurrences exist, the last keyword
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1392 definition is used.")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1393
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1394 (defconst ispell-pdict-keyword "Local IspellPersDict: "
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1395 "The keyword for defining buffer local dictionaries.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1396 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
1397 The last occurring definition in the buffer will be used.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1398
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1399 (defconst ispell-parsing-keyword "Local IspellParsing: "
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1400 "The keyword for overriding default Ispell parsing.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1401 The above keyword string should be followed by `latex-mode' or
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1402 `nroff-mode' to put the current buffer into the desired parsing mode.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1403
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1404 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
1405 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
1406 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
1407
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1408 ;;;###autoload
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1409 (defvar ispell-skip-region-alist
105798
0ad1fc06bfc8 * puresize.h (BASE_PURESIZE): Increase to 1470000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105722
diff changeset
1410 `((ispell-words-keyword forward-line)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1411 (ispell-dictionary-keyword forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1412 (ispell-pdict-keyword forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1413 (ispell-parsing-keyword forward-line)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1414 (,(purecopy "^---*BEGIN PGP [A-Z ]*--*")
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1415 . ,(purecopy "^---*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
1416 ;; assume multiline uuencoded file? "\nM.*$"?
105798
0ad1fc06bfc8 * puresize.h (BASE_PURESIZE): Increase to 1470000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105722
diff changeset
1417 (,(purecopy "^begin [0-9][0-9][0-9] [^ \t]+$") . ,(purecopy "\nend\n"))
0ad1fc06bfc8 * puresize.h (BASE_PURESIZE): Increase to 1470000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105722
diff changeset
1418 (,(purecopy "^%!PS-Adobe-[123].0") . ,(purecopy "\n%%EOF\n"))
0ad1fc06bfc8 * puresize.h (BASE_PURESIZE): Increase to 1470000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105722
diff changeset
1419 (,(purecopy "^---* \\(Start of \\)?[Ff]orwarded [Mm]essage")
0ad1fc06bfc8 * puresize.h (BASE_PURESIZE): Increase to 1470000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105722
diff changeset
1420 . ,(purecopy "^---* 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
1421 ;; 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
1422 ;; `-+' `_+' 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
1423 ;; `-' or `_' part of word syntax.
105965
3f64b8380468 * textmodes/ispell.el (ispell-skip-region-alist):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105870
diff changeset
1424 (,(purecopy "\\(--+\\|_+\\|\\(/\\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
1425 ;; above checks /.\w sequences
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1426 ;;("\\(--+\\|\\(/\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)")
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1427 ;; 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
1428 ;; "\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+"
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
1429 ;; 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
1430 ;; 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
1431 ;; 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
1432 ;; 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
1433 ;; "\\(\\w\\|[-_]\\)+[.:@]\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_]\\|~\\)+\\)+"
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1434 )
22529
d9eac134a41b Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22526
diff changeset
1435 "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
1436 The alist key must be a regular expression.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1437 Valid forms include:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1438 (KEY) - just skip the key.
22529
d9eac134a41b Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22526
diff changeset
1439 (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
1440 (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
1441 (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
1442 (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
1443
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1444
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1445 ;;;###autoload
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1446 (defvar ispell-tex-skip-alists
105870
26baacb565b0 * textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105798
diff changeset
1447 (purecopy
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
1448 '((;;("%\\[" . "%\\]") ; AMStex block comment...
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1449 ;; 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
1450 ;; \cite, \hspace, \hspace*, \hyphenation, \include, \includeonly, \input,
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1451 ;; \label, \nocite, \rule (in ispell - rest included here)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1452 ("\\\\addcontentsline" ispell-tex-arg-end 2)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1453 ("\\\\add\\(tocontents\\|vspace\\)" ispell-tex-arg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1454 ("\\\\\\([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
1455 ;;("\\\\author" ispell-tex-arg-end)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1456 ("\\\\bibliographystyle" ispell-tex-arg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1457 ("\\\\makebox" ispell-tex-arg-end 0)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1458 ("\\\\e?psfig" ispell-tex-arg-end)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1459 ("\\\\document\\(class\\|style\\)" .
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1460 "\\\\begin[ \t\n]*{[ \t\n]*document[ \t\n]*}"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1461 (;; delimited with \begin. In ispell: displaymath, eqnarray, eqnarray*,
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1462 ;; equation, minipage, picture, tabular, tabular* (ispell)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1463 ("\\(figure\\|table\\)\\*?" ispell-tex-arg-end 0)
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1464 ("list" ispell-tex-arg-end 2)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1465 ("program" . "\\\\end[ \t\n]*{[ \t\n]*program[ \t\n]*}")
105870
26baacb565b0 * textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105798
diff changeset
1466 ("verbatim\\*?" . "\\\\end[ \t\n]*{[ \t\n]*verbatim\\*?[ \t\n]*}"))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1467 "*Lists of regions to be skipped in TeX mode.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1468 First list is used raw.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1469 Second list has key placed inside \\begin{}.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1470
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1471 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
1472 for skipping in latex mode.")
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
1473 (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
1474
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1475
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1476 ;;;###autoload
105870
26baacb565b0 * textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105798
diff changeset
1477 (defconst ispell-html-skip-alists
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1478 '(("<[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
1479 ("<[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
1480 ("<[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
1481 ("<[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
1482 ;;("<[tT][tT]\\>[^>]*>" "<[tT][tT]\\>[^>]*>")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1483 ("<[tT][tT]/" "/")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1484 ("<[^ \t\n>]" ">")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1485 ("&[^ \t\n;]" "[; \t\n]"))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1486 "*Lists of start and end keys to skip in HTML buffers.
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
1487 Same format as `ispell-skip-region-alist'.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1488 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
1489 (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
1490 (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
1491
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1492 (defvar ispell-local-pdict ispell-personal-dictionary
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1493 "A buffer local variable containing the current personal dictionary.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1494 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
1495
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1496 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
1497 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
1498 to calling \\[ispell-change-dictionary]. This variable is automatically
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1499 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
1500 local variable syntax.")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1501
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1502 (make-variable-buffer-local 'ispell-local-pdict)
79663
f1019ace895b * textmodes/ispell.el (ispell-local-pdict): Add safe-local-variable property.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 79646
diff changeset
1503 ;;;###autoload(put 'ispell-local-pdict 'safe-local-variable 'stringp)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1504
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1505 (defvar ispell-buffer-local-name nil
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1506 "Contains the buffer name if local word definitions were used.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1507 Ispell is then restarted because the local words could conflict.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1508
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1509 (defvar ispell-parser 'use-mode-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1510 "*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
1511 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
1512 Default parser is `nroff'.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1513 Currently the only other valid parser is `tex'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1514
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1515 You can set this variable in hooks in your init file -- eg:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1516
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
1517 \(add-hook 'tex-mode-hook (lambda () (setq ispell-parser 'tex)))")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1518
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1519 (defvar ispell-region-end (make-marker)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1520 "Marker that allows spelling continuations.")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1521
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
1522 (defvar ispell-check-only nil
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
1523 "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
1524
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1525
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1526 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1527 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1528
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1529
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1530
52103
1ffb07fde6de Don't redo key bindings on loading, put them only in loaddefs.el.
Andreas Schwab <schwab@suse.de>
parents: 51151
diff changeset
1531 ;;;###autoload (define-key esc-map "$" 'ispell-word)
6839
7cd9ecd593d7 Bind M-$.
Richard M. Stallman <rms@gnu.org>
parents: 6646
diff changeset
1532
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1533
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1534 (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
1535 "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
1536 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
1537 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
1538 (if ispell-async-processp
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1539 (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
1540 (if (null ispell-process)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1541 (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
1542 (let ((buf ispell-output-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1543 ispell-output)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1544 (if (not (bufferp buf))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1545 (setq ispell-filter nil)
104705
e8247765661a (ispell-accept-output, ispell-command-loop): Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104681
diff changeset
1546 (with-current-buffer buf
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1547 (setq ispell-output (buffer-substring-no-properties
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1548 (point-min) (point-max))))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1549 (ispell-filter t ispell-output)
104705
e8247765661a (ispell-accept-output, ispell-command-loop): Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104681
diff changeset
1550 (with-current-buffer buf
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1551 (erase-buffer)))))))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1552
56932
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1553 (defun ispell-send-replacement (misspelled replacement)
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1554 "Notify aspell that MISSPELLED should be spelled REPLACEMENT.
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
1555 This allows it to improve the suggestion list based on actual misspellings."
56932
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1556 (and ispell-really-aspell
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1557 (ispell-send-string (concat "$$ra " misspelled "," replacement "\n"))))
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
1558
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1559
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1560 (defun ispell-send-string (string)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1561 "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
1562 (if ispell-async-processp
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1563 (process-send-string ispell-process string)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1564 ;; 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
1565 ;; 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
1566 ;; 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
1567 ;; 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
1568 ;; 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
1569 (let ((cmd (aref string 0))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1570 ;; 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
1571 ;; 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
1572 (cmds-to-defer '(?* ?@ ?~ ?+ ?- ?! ?%))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1573 (session-buf ispell-session-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1574 (output-buf ispell-output-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1575 (ispell-args ispell-cmd-args)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1576 (defdir ispell-process-directory)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1577 prev-pos)
104681
91afee51b252 * textmodes/ispell.el (ispell-check-version, ispell-send-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104002
diff changeset
1578 (with-current-buffer session-buf
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1579 (setq prev-pos (point))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1580 (setq default-directory defdir)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1581 (insert string)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1582 (if (not (memq cmd cmds-to-defer))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1583 (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
1584 (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
1585 enable-multibyte-characters)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1586 (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
1587 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
1588 (set-buffer output-buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1589 (erase-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1590 (set-buffer session-buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1591 (setq status
76633
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
1592 (apply 'ispell-call-process-region
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
1593 (point-min) (point-max)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1594 ispell-program-name nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1595 output-buf nil
100500
e7cd485b79ff (ispell-really-hunspell): new variable to signal hunspell
Agustin Martin <agustin.martin@hispalinux.es>
parents: 99698
diff changeset
1596 "-a"
e7cd485b79ff (ispell-really-hunspell): new variable to signal hunspell
Agustin Martin <agustin.martin@hispalinux.es>
parents: 99698
diff changeset
1597 ;; hunspell -m option means something different
e7cd485b79ff (ispell-really-hunspell): new variable to signal hunspell
Agustin Martin <agustin.martin@hispalinux.es>
parents: 99698
diff changeset
1598 (if ispell-really-hunspell "" "-m")
e7cd485b79ff (ispell-really-hunspell): new variable to signal hunspell
Agustin Martin <agustin.martin@hispalinux.es>
parents: 99698
diff changeset
1599 ispell-args))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1600 (set-buffer output-buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1601 (goto-char (point-min))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1602 (save-match-data
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1603 (if (not (looking-at "@(#) "))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1604 (error "Ispell error: %s"
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1605 (buffer-substring-no-properties
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1606 (point) (progn (end-of-line) (point)))))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1607 ;; 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
1608 ;; 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
1609 ;; 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
1610 ;; `ispell-filter'.
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1611 (or (string= string "\032\n")
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1612 (progn
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1613 (forward-line)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1614 (delete-region (point-min) (point))))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1615 ;; 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
1616 ;; 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
1617 ;; 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
1618 ;; 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
1619 ;; the personal dictionary.
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1620 (set-buffer session-buf)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1621 (delete-region prev-pos (point))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1622 ;; Ispell run synchronously saves the personal dictionary
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1623 ;; 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
1624 ;; 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
1625 ;; dictionary.
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1626 (if (memq status '(0 nil))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1627 (let ((more-lines t))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1628 (goto-char (point-min))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1629 (while more-lines
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1630 (if (looking-at "^\\*")
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1631 (let ((start (point)))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1632 (forward-line)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1633 (delete-region start (point)))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1634 (setq more-lines (= 0 (forward-line))))))))))))))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1635
94382
d97dbf46a59a (ispell-insert-word): Revert previous change.
Glenn Morris <rgm@gnu.org>
parents: 94365
diff changeset
1636
102028
a141297219f8 (ispell-insert-word): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents: 101310
diff changeset
1637 ;; Insert WORD while possibly translating characters by
a141297219f8 (ispell-insert-word): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents: 101310
diff changeset
1638 ;; translation-table-for-input.
94382
d97dbf46a59a (ispell-insert-word): Revert previous change.
Glenn Morris <rgm@gnu.org>
parents: 94365
diff changeset
1639 (defun ispell-insert-word (word)
d97dbf46a59a (ispell-insert-word): Revert previous change.
Glenn Morris <rgm@gnu.org>
parents: 94365
diff changeset
1640 (let ((pos (point)))
d97dbf46a59a (ispell-insert-word): Revert previous change.
Glenn Morris <rgm@gnu.org>
parents: 94365
diff changeset
1641 (insert word)
102028
a141297219f8 (ispell-insert-word): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents: 101310
diff changeset
1642 ;; Avoid "obsolete" warnings for translation-table-for-input.
a141297219f8 (ispell-insert-word): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents: 101310
diff changeset
1643 (with-no-warnings
a141297219f8 (ispell-insert-word): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents: 101310
diff changeset
1644 (if (char-table-p translation-table-for-input)
a141297219f8 (ispell-insert-word): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents: 101310
diff changeset
1645 (translate-region pos (point) translation-table-for-input)))))
94382
d97dbf46a59a (ispell-insert-word): Revert previous change.
Glenn Morris <rgm@gnu.org>
parents: 94365
diff changeset
1646
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1647 ;;;###autoload
85378
5e06a33ec5a4 (ispell-word): Add interactive arg `region'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 85298
diff changeset
1648 (defun ispell-word (&optional following quietly continue region)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1649 "Check spelling of word under or before the cursor.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1650 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
1651 in a window allowing you to choose one.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
1652
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1653 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
1654 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
1655 \(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
1656 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
1657 when called interactively, non-corrective messages are suppressed.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1658
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
1659 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
1660 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
1661
85378
5e06a33ec5a4 (ispell-word): Add interactive arg `region'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 85298
diff changeset
1662 Interactively, in Transient Mark mode when the mark is active, call
5e06a33ec5a4 (ispell-word): Add interactive arg `region'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 85298
diff changeset
1663 `ispell-region' to check the active region for spelling errors.
5e06a33ec5a4 (ispell-word): Add interactive arg `region'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 85298
diff changeset
1664
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1665 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
1666 which is in `ispell-local-dictionary-alist' or `ispell-dictionary-alist'.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1667
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1668 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
1669 or \\[ispell-region] to update the Ispell process.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1670
75880
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
1671 Return values:
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
1672 nil word is correct or spelling is accepted.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1673 0 word is inserted into buffer-local definitions.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1674 \"word\" word corrected from word list.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1675 \(\"word\" arg\) word is hand entered.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1676 quit spell session exited."
85378
5e06a33ec5a4 (ispell-word): Add interactive arg `region'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 85298
diff changeset
1677 (interactive (list ispell-following-word ispell-quietly current-prefix-arg t))
85298
5f8ed0fbae95 (ispell-word): Call `ispell-region' on the active region in transient-mark-mode.
Juri Linkov <juri@jurta.org>
parents: 78482
diff changeset
1678 (cond
99217
967ef6e9e7a8 (ispell-word): Use use-region-p.
Chong Yidong <cyd@stupidchicken.com>
parents: 98059
diff changeset
1679 ((and region (use-region-p))
85298
5f8ed0fbae95 (ispell-word): Call `ispell-region' on the active region in transient-mark-mode.
Juri Linkov <juri@jurta.org>
parents: 78482
diff changeset
1680 (ispell-region (region-beginning) (region-end)))
5f8ed0fbae95 (ispell-word): Call `ispell-region' on the active region in transient-mark-mode.
Juri Linkov <juri@jurta.org>
parents: 78482
diff changeset
1681 (continue (ispell-continue))
5f8ed0fbae95 (ispell-word): Call `ispell-region' on the active region in transient-mark-mode.
Juri Linkov <juri@jurta.org>
parents: 78482
diff changeset
1682 (t
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
1683 (ispell-set-spellchecker-params) ; Initialize variables and dicts alists
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1684 (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
1685 (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
1686 (word (ispell-get-word following))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1687 start end poss new-word replace)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1688 ;; De-structure return word info list.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1689 (setq start (car (cdr word))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1690 end (car (cdr (cdr word)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1691 word (car word))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1692
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1693 ;; 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
1694 ;; 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
1695 (or quietly
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1696 (message "Checking spelling of %s..."
70814
6a91e8b1eea0 (ispell-format-word): Make this the alias for the following variable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70398
diff changeset
1697 (funcall ispell-format-word-function word)))
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1698 (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
1699 (ispell-send-string (concat "^" word "\n"))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1700 ;; wait until ispell has processed word
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1701 (while (progn
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1702 (ispell-accept-output)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1703 (not (string= "" (car ispell-filter)))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1704 ;;(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
1705 (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
1706 (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
1707 (if (> (length ispell-filter) 1)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1708 (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
1709 (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
1710 (cond ((eq poss t)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1711 (or quietly
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1712 (message "%s is correct"
70814
6a91e8b1eea0 (ispell-format-word): Make this the alias for the following variable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70398
diff changeset
1713 (funcall ispell-format-word-function word)))
87941
d77b6e5ee8af * sieve.el (sieve-make-overlay, sieve-overlay-put, sieve-overlays-at):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
1714 (and (featurep 'xemacs)
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1715 (extent-at start)
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1716 (and (fboundp 'delete-extent)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1717 (delete-extent (extent-at start)))))
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1718 ((stringp poss)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1719 (or quietly
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1720 (message "%s is correct because of root %s"
70814
6a91e8b1eea0 (ispell-format-word): Make this the alias for the following variable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70398
diff changeset
1721 (funcall ispell-format-word-function word)
6a91e8b1eea0 (ispell-format-word): Make this the alias for the following variable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70398
diff changeset
1722 (funcall ispell-format-word-function poss)))
87941
d77b6e5ee8af * sieve.el (sieve-make-overlay, sieve-overlay-put, sieve-overlays-at):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
1723 (and (featurep 'xemacs)
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1724 (extent-at start)
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1725 (and (fboundp 'delete-extent)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1726 (delete-extent (extent-at start)))))
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1727 ((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
1728 (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
1729 (if (fboundp 'make-extent)
64855
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1730 (if (fboundp 'set-extent-property)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1731 (let ((ext (make-extent start end)))
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1732 (set-extent-property ext 'face ispell-highlight-face)
2fe6c83ec9b4 (ispell-word): More fboundp checks.
Richard M. Stallman <rms@gnu.org>
parents: 64751
diff changeset
1733 (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
1734 (beep)
70814
6a91e8b1eea0 (ispell-format-word): Make this the alias for the following variable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70398
diff changeset
1735 (message "%s is incorrect"
6a91e8b1eea0 (ispell-format-word): Make this the alias for the following variable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70398
diff changeset
1736 (funcall ispell-format-word-function word))))
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1737 (t ; prompt for correct word.
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1738 (save-window-excursion
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1739 (setq replace (ispell-command-loop
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1740 (car (cdr (cdr poss)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1741 (car (cdr (cdr (cdr poss))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1742 (car poss) start end)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1743 (cond ((equal 0 replace)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1744 (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
1745 (replace
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1746 (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
1747 cursor-location (+ (- (length word) (- end start))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1748 cursor-location))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1749 (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
1750 (progn
72130
c7889d24e9d7 (ispell-word): If we replace the word, move point to the end.
Richard M. Stallman <rms@gnu.org>
parents: 71289
diff changeset
1751 (goto-char start)
c7889d24e9d7 (ispell-word): If we replace the word, move point to the end.
Richard M. Stallman <rms@gnu.org>
parents: 71289
diff changeset
1752 ;; Insert first and then delete,
c7889d24e9d7 (ispell-word): If we replace the word, move point to the end.
Richard M. Stallman <rms@gnu.org>
parents: 71289
diff changeset
1753 ;; to avoid collapsing markers before and after
c7889d24e9d7 (ispell-word): If we replace the word, move point to the end.
Richard M. Stallman <rms@gnu.org>
parents: 71289
diff changeset
1754 ;; into a single place.
94382
d97dbf46a59a (ispell-insert-word): Revert previous change.
Glenn Morris <rgm@gnu.org>
parents: 94365
diff changeset
1755 (ispell-insert-word new-word)
77748
21c0fd9e61cb (ispell-get-word): Return markers for start and end positions.
Richard M. Stallman <rms@gnu.org>
parents: 77738
diff changeset
1756 (delete-region (point) end)
72130
c7889d24e9d7 (ispell-word): If we replace the word, move point to the end.
Richard M. Stallman <rms@gnu.org>
parents: 71289
diff changeset
1757 ;; It is meaningless to preserve the cursor position
c7889d24e9d7 (ispell-word): If we replace the word, move point to the end.
Richard M. Stallman <rms@gnu.org>
parents: 71289
diff changeset
1758 ;; inside a word that has changed.
c7889d24e9d7 (ispell-word): If we replace the word, move point to the end.
Richard M. Stallman <rms@gnu.org>
parents: 71289
diff changeset
1759 (setq cursor-location (point))
63816
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1760 (setq end (point))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1761 (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
1762 (progn
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1763 (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
1764 (save-window-excursion
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1765 (query-replace word new-word t)))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1766 (goto-char start)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1767 ;; 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
1768 (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
1769 ))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1770 ;; 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
1771 (if (get-buffer ispell-choices-buffer)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1772 (kill-buffer ispell-choices-buffer))))
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1773 (ispell-pdict-save ispell-silently-savep)
af4dc212b013 (ispell-word): Do not ignore short words.
Richard M. Stallman <rms@gnu.org>
parents: 63166
diff changeset
1774 ;; 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
1775 (if ispell-quit (setq ispell-quit nil replace 'quit))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1776 (goto-char cursor-location) ; return to original location
85298
5f8ed0fbae95 (ispell-word): Call `ispell-region' on the active region in transient-mark-mode.
Juri Linkov <juri@jurta.org>
parents: 78482
diff changeset
1777 replace))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1778
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1779
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1780 (defun ispell-get-word (following &optional extra-otherchars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1781 "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
1782 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
1783 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
1784 \(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
1785 Optional second argument contains otherchars that can be included in word
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1786 many times.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1787
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
1788 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
1789 which is in `ispell-local-dictionary-alist' or `ispell-dictionary-alist'."
102529
be8a3c9869d3 ispell.el (ispell-get-word): Initialize spellchecker params.
Agustin Martin <agustin.martin@hispalinux.es>
parents: 102249
diff changeset
1790 (ispell-set-spellchecker-params) ; Initialize variables and dicts alists
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1791 (let* ((ispell-casechars (ispell-get-casechars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1792 (ispell-not-casechars (ispell-get-not-casechars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1793 (ispell-otherchars (ispell-get-otherchars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1794 (ispell-many-otherchars-p (ispell-get-many-otherchars-p))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1795 (word-regexp (concat ispell-casechars
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1796 "+\\("
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1797 (if (not (string= "" ispell-otherchars))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1798 (concat ispell-otherchars "?"))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1799 (if extra-otherchars
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1800 (concat extra-otherchars "?"))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1801 ispell-casechars
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1802 "+\\)"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1803 (if (or ispell-many-otherchars-p
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1804 extra-otherchars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1805 "*" "?")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1806 did-it-once prevpt
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1807 start end word)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1808 ;; find the word
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1809 (if (not (looking-at ispell-casechars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1810 (if following
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1811 (re-search-forward ispell-casechars (point-max) t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1812 (re-search-backward ispell-casechars (point-min) t)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1813 ;; move to front of word
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1814 (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
1815 (while (and (or (and (not (string= "" ispell-otherchars))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1816 (looking-at ispell-otherchars))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1817 (and extra-otherchars (looking-at extra-otherchars)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1818 (not (bobp))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1819 (or (not did-it-once)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1820 ispell-many-otherchars-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1821 (not (eq prevpt (point))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1822 (if (and extra-otherchars (looking-at extra-otherchars))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1823 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1824 (backward-char 1)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1825 (if (looking-at ispell-casechars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1826 (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
1827 (setq did-it-once t
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1828 prevpt (point))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1829 (backward-char 1)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1830 (if (looking-at ispell-casechars)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1831 (re-search-backward ispell-not-casechars (point-min) 'move)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1832 (backward-char -1))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1833 ;; 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
1834 (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
1835 (if ispell-check-only
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1836 ;; 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
1837 (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
1838 (error "No word found to check!"))
77748
21c0fd9e61cb (ispell-get-word): Return markers for start and end positions.
Richard M. Stallman <rms@gnu.org>
parents: 77738
diff changeset
1839 (setq start (copy-marker (match-beginning 0))
21c0fd9e61cb (ispell-get-word): Return markers for start and end positions.
Richard M. Stallman <rms@gnu.org>
parents: 77738
diff changeset
1840 end (point-marker)
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
1841 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
1842 (list word start end))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1843
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1844
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1845 ;;; Global ispell-pdict-modified-p is set by ispell-command-loop and
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1846 ;;; tracks changes in the dictionary. The global may either be
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1847 ;;; 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
1848 ;;; dictionary needs to be saved.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1849
37426
71d360920aad Fix autoload cookies.
Gerd Moellmann <gerd@gnu.org>
parents: 37007
diff changeset
1850 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1851 (defun ispell-pdict-save (&optional no-query force-save)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1852 "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
1853 If so, ask if it needs to be saved."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1854 (interactive (list ispell-silently-savep t))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1855 (if (and ispell-pdict-modified-p (listp ispell-pdict-modified-p))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1856 (setq ispell-pdict-modified-p (car ispell-pdict-modified-p)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1857 (if (or ispell-pdict-modified-p force-save)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1858 (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
1859 (progn
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1860 (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
1861 (message "Personal dictionary saved."))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1862 ;; unassert variable, even if not saved to avoid questioning.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1863 (setq ispell-pdict-modified-p nil))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1864
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1865
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1866 (defun ispell-command-loop (miss guess word start end)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1867 "Display possible corrections from list MISS.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1868 GUESS lists possibly valid affix construction of WORD.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1869 Returns nil to keep word.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1870 Returns 0 to insert locally into buffer-local dictionary.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1871 Returns string for new chosen word.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
1872 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
1873 Query-replace when list length is 2.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1874 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
1875 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
1876 Global `ispell-pdict-modified-p' becomes a list where the only value
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
1877 indicates whether the dictionary has been modified when option `a'
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
1878 or `i' is used.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1879 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
1880 (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
1881 (line ispell-choices-win-default-height)
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
1882 ;; ensure 4 context lines.
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
1883 (max-lines (- (ispell-adjusted-window-height) 4))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1884 (choices miss)
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1885 (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
1886 ispell-choices-win-default-height))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1887 (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
1888 (dedicated (window-dedicated-p (selected-window)))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1889 (skipped 0)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
1890 char num result textwin dedicated-win)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1891
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1892 ;; setup the *Choices* buffer with valid data.
104705
e8247765661a (ispell-accept-output, ispell-command-loop): Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104681
diff changeset
1893 (with-current-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
1894 (setq mode-line-format
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1895 (concat
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1896 "-- %b -- word: " word
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1897 " -- dict: " (or ispell-current-dictionary "default")
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
1898 " -- 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
1899 ;; 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
1900 (with-no-warnings
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
1901 (and (fboundp 'set-specifier)
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
1902 (boundp 'horizontal-scrollbar-visible-p)
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
1903 (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
1904 (cons (current-buffer) nil))))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1905 (erase-buffer)
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1906 (if guess
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1907 (progn
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1908 (insert "Affix rules generate and capitalize "
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1909 "this word as shown below:\n\t")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1910 (while guess
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1911 (if (> (+ 4 (current-column) (length (car guess)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1912 (window-width))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1913 (progn
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1914 (insert "\n\t")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1915 (setq line (1+ line))))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1916 (insert (car guess) " ")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1917 (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
1918 (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
1919 (setq line (+ line (if choices 3 2)))))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1920 (while (and choices
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1921 (< (if (> (+ 7 (current-column) (length (car choices))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1922 (if (> count ?~) 3 0))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1923 (window-width))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1924 (progn
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1925 (insert "\n")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1926 (setq line (1+ line)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1927 line)
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1928 max-lines))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1929 ;; 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
1930 ;; 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
1931 (while (memq count command-characters) ; skip command characters.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1932 (setq count (ispell-int-char (1+ count))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1933 skipped (1+ skipped)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1934 (insert "(" count ") " (car choices) " ")
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1935 (setq choices (cdr choices)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1936 count (ispell-int-char (1+ count))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1937 (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
1938
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
1939 ;; ensure word is visible
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1940 (if (not (pos-visible-in-window-p end))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1941 (sit-for 0))
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
1942
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1943 ;; allow temporary split of dedicated windows...
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1944 (if dedicated
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1945 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1946 (setq dedicated-win (selected-window))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1947 (set-window-dedicated-p dedicated-win nil)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1948
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1949 ;; Display choices for misspelled word.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1950 (ispell-show-choices line end)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1951 (select-window (setq textwin (next-window)))
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1952
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1953 ;; highlight word, protecting current buffer status
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1954 (unwind-protect
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1955 (progn
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1956 (and ispell-highlight-p
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
1957 (ispell-highlight-spelling-error start end t))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1958 ;; Loop until a valid choice is made.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1959 (while
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1960 (eq
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1961 t
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1962 (setq
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1963 result
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1964 (progn
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1965 (undo-boundary)
17143
df636f296adf (ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents: 16762
diff changeset
1966 (let (message-log-max)
df636f296adf (ispell-command-loop): Disable message logging.
Karl Heuer <kwzh@gnu.org>
parents: 16762
diff changeset
1967 (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
1968 "unchanged, Character to replace word")))
98059
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1969 (let ((inhibit-quit t)
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1970 (input-valid t))
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1971 (setq char nil skipped 0)
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1972 ;; If the user types C-g, or generates some other
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1973 ;; non-character event (such as a frame switch
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1974 ;; event), stop ispell. As a special exception,
106840
5df8e547a422 Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
1975 ;; ignore mouse events occurring in the same frame.
98059
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1976 (while (and input-valid (not (characterp char)))
105007
77633f71fa50 (ispell-command-loop): Improve last fix, using the new read-key function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104997
diff changeset
1977 (setq char (read-key))
98059
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1978 (setq input-valid
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1979 (or (characterp char)
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1980 (and (mouse-event-p char)
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1981 (eq (selected-frame)
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1982 (window-frame
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1983 (posn-window (event-start char))))))))
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1984 (when (or quit-flag (not input-valid) (= char ?\C-g))
fa8fea8ec49a (ispell-command-loop): Suspend ispell if the user enters a mouse event
Chong Yidong <cyd@stupidchicken.com>
parents: 97786
diff changeset
1985 (setq char ?X quit-flag nil)))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1986 ;; Adjust num to array offset skipping command characters.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1987 (let ((com-chars command-characters))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1988 (while com-chars
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1989 (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
1990 (setq skipped (1+ skipped)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1991 (setq com-chars (cdr com-chars)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1992 (setq num (- char ?0 skipped)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1993
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1994 (cond
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
1995 ((= char ? ) nil) ; accept word this time only
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1996 ((= 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
1997 (ispell-send-string (concat "*" word "\n"))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1998 (setq ispell-pdict-modified-p '(t)) ; dictionary modified!
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
1999 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2000 ((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
2001 (ispell-send-string (concat "@" word "\n"))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2002 (if (null ispell-pdict-modified-p)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2003 (setq ispell-pdict-modified-p
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2004 (list ispell-pdict-modified-p)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2005 (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
2006 ((or (= char ?r) (= char ?R)) ; type in replacement
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2007 (and (eq 'block ispell-highlight-p) ; refresh tty's
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2008 (ispell-highlight-spelling-error start end nil t))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2009 (let ((result
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2010 (if (or (= char ?R) ispell-query-replace-choices)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2011 (list (read-string
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2012 (format "Query-replacement for %s: "word)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2013 word)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2014 t)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2015 (cons (read-string "Replacement for: " word)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2016 nil))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2017 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2018 (ispell-highlight-spelling-error start end nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2019 'block))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2020 result))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2021 ((or (= char ??) (= char help-char) (= char ?\C-h))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2022 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2023 (ispell-highlight-spelling-error start end nil t))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2024 (ispell-help)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2025 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2026 (ispell-highlight-spelling-error start end nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2027 'block))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2028 t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2029 ;; Quit and move point back.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2030 ((= char ?x)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2031 (ispell-pdict-save ispell-silently-savep)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2032 (message "Exited spell-checking")
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2033 (setq ispell-quit t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2034 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2035 ;; Quit and preserve point.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2036 ((= char ?X)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2037 (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
2038 (message "%s"
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2039 (substitute-command-keys
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2040 (concat "Spell-checking suspended;"
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2041 " use C-u \\[ispell-word] to resume")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2042 (setq ispell-quit start)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2043 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2044 ((= char ?q)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2045 (if (y-or-n-p "Really kill Ispell process? ")
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2046 (progn
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2047 (ispell-kill-ispell t) ; terminate process.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2048 (setq ispell-quit (or (not ispell-checking-message)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2049 (point))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2050 ispell-pdict-modified-p nil))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2051 t)) ; continue if they don't quit.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2052 ((= char ?l)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2053 (and (eq 'block ispell-highlight-p) ; refresh tty displays
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2054 (ispell-highlight-spelling-error start end nil t))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2055 (let ((new-word (read-string
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2056 "Lookup string (`*' is wildcard): "
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2057 word)))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2058 (if new-word
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2059 (progn
104705
e8247765661a (ispell-accept-output, ispell-command-loop): Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104681
diff changeset
2060 (with-current-buffer (get-buffer-create
e8247765661a (ispell-accept-output, ispell-command-loop): Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104681
diff changeset
2061 ispell-choices-buffer)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2062 (erase-buffer)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2063 (setq count ?0
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2064 skipped 0
109161
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2065 mode-line-format ;; setup the *Choices* buffer with valid data.
64196
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
2066 (concat "-- %b -- word: " new-word
109161
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2067 " -- word-list: "
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2068 (or ispell-complete-word-dict
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2069 ispell-alternate-dictionary))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2070 miss (lookup-words new-word)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2071 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
2072 line ispell-choices-win-default-height)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2073 (while (and choices ; adjust choices window.
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2074 (< (if (> (+ 7 (current-column)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2075 (length (car choices))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2076 (if (> count ?~) 3 0))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2077 (window-width))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2078 (progn
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2079 (insert "\n")
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2080 (setq line (1+ line)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2081 line)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2082 max-lines))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2083 (while (memq count command-characters)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2084 (setq count (ispell-int-char (1+ count))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2085 skipped (1+ skipped)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2086 (insert "(" count ") " (car choices) " ")
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2087 (setq choices (cdr choices)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2088 count (ispell-int-char (1+ count))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2089 (setq count (ispell-int-char
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2090 (- count ?0 skipped))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2091 (ispell-show-choices line end)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2092 (select-window (next-window)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2093 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2094 (ispell-highlight-spelling-error start end nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2095 'block))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2096 t) ; reselect from new choices
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
2097 ((= char ?u) ; insert lowercase into dictionary
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2098 (ispell-send-string (concat "*" (downcase word) "\n"))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2099 (setq ispell-pdict-modified-p '(t)) ; dictionary modified!
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2100 nil)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2101 ((= 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
2102 (ispell-send-string
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2103 (concat "*" (read-string "Insert: " word) "\n"))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2104 (setq ispell-pdict-modified-p '(t))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2105 (cons word nil))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2106 ((and (>= num 0) (< num count))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2107 (if ispell-query-replace-choices ; Query replace flag
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2108 (list (nth num miss) 'query-replace)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2109 (nth num miss)))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2110 ((= char ?\C-l)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2111 (redraw-display) t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2112 ((= char ?\C-r)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2113 ;; 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
2114 (if (marker-position ispell-recursive-edit-marker)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2115 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2116 (message "Only one recursive edit session supported")
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2117 (beep)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2118 (sit-for 2))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2119 (set-marker ispell-recursive-edit-marker start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2120 ;;(set-marker ispell-region-end reg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2121 (and ispell-highlight-p ; unhighlight
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2122 (ispell-highlight-spelling-error start end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2123 (unwind-protect
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2124 (progn
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2125 (message
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2126 "%s"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2127 (substitute-command-keys
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2128 (concat "Exit recursive edit with"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2129 " \\[exit-recursive-edit]")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2130 (save-window-excursion (save-excursion
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2131 (recursive-edit))))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2132 ;; protected
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2133 (goto-char ispell-recursive-edit-marker)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2134 (if (not (equal (marker-buffer
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2135 ispell-recursive-edit-marker)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2136 (current-buffer)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2137 (progn
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2138 (set-marker ispell-recursive-edit-marker nil)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2139 (error
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2140 "Cannot continue ispell from this buffer.")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2141 (set-marker ispell-recursive-edit-marker nil)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2142 (list word nil)) ; recheck starting at this word.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2143 ((= char ?\C-z)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2144 (funcall (key-binding "\C-z"))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2145 t)
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2146 (t (ding) t))))))
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2147 result)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2148 ;; protected
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2149 (and ispell-highlight-p ; unhighlight
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2150 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2151 (select-window textwin)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2152 (ispell-highlight-spelling-error start end)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2153 (if dedicated
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2154 (set-window-dedicated-p dedicated-win t)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2155
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2156
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2157
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2158 (defun ispell-show-choices (line end)
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
2159 "Show the choices in another buffer or frame."
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2160 (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
2161 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2162 (framepop-display-buffer (get-buffer ispell-choices-buffer))
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2163 ;; (get-buffer-window ispell-choices-buffer t)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2164 (select-window (previous-window))) ; *Choices* window
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2165 ;; 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
2166 (let ((choices-window (get-buffer-window ispell-choices-buffer)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2167 (if choices-window
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2168 (if (= line (ispell-adjusted-window-height choices-window))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2169 (select-window choices-window)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2170 ;; *Choices* window changed size. Adjust the choices window
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2171 ;; without scrolling the spelled window when possible
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2172 (let ((window-line
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2173 (- line (ispell-adjusted-window-height choices-window)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2174 (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
2175 (if (< line ispell-choices-win-default-height)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2176 (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
2177 (- ispell-choices-win-default-height
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2178 line))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2179 (move-to-window-line 0)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2180 (vertical-motion window-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2181 (set-window-start (selected-window)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2182 (if (> (point) visible) visible (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2183 (goto-char end)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2184 (select-window choices-window)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2185 (enlarge-window window-line)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2186 ;; 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
2187 (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
2188 (switch-to-buffer ispell-choices-buffer)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2189 (goto-char (point-min)))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2190
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2191
6288
3197bf3cc0a1 (ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents: 6285
diff changeset
2192 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2193 (defun ispell-help ()
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2194 "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
2195
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2196 Selections are:
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2197
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2198 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
2199 SPC: Accept word this time.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2200 `i': Accept word and insert into private dictionary.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2201 `a': Accept word for this session.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2202 `A': Accept word and place in `buffer-local dictionary'.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2203 `r': Replace word with typed-in value. Rechecked.
106840
5df8e547a422 Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
2204 `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2205 `?': Show these commands.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2206 `x': Exit spelling buffer. Move cursor to original point.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2207 `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
2208 the aborted check to be completed later.
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2209 `q': Quit spelling session (Kills ispell process).
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2210 `l': Look up typed-in replacement in alternate dictionary. Wildcards okay.
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2211 `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
2212 `m': Place typed-in value in personal dictionary, then recheck current word.
75880
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
2213 `C-l': Redraw screen.
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
2214 `C-r': Recursive edit.
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
2215 `C-z': Suspend Emacs or iconify frame."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2216
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2217 (if (equal ispell-help-in-bufferp 'electric)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2218 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2219 (require 'ehelp)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
2220 (with-electric-help
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2221 (function (lambda ()
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2222 ;;This shouldn't be necessary: with-electric-help needs
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2223 ;; an optional argument telling it about the smallest
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2224 ;; 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
2225 ;;(if (< (window-height) 15)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2226 ;; (enlarge-window
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2227 ;; (- 15 (ispell-adjusted-window-height))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2228 (princ "Selections are:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2229
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2230 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
2231 SPC: Accept word this time.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2232 `i': Accept word and insert into private dictionary.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2233 `a': Accept word for this session.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2234 `A': Accept word and place in `buffer-local dictionary'.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2235 `r': Replace word with typed-in value. Rechecked.
106840
5df8e547a422 Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
2236 `R': Replace word with typed-in value. Query-replaced in buffer. Rechecked.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2237 `?': Show these commands.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2238 `x': Exit spelling buffer. Move cursor to original point.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2239 `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
2240 the aborted check to be completed later.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2241 `q': Quit spelling session (Kills ispell process).
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2242 `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
2243 `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
2244 `m': Place typed-in value in personal dictionary, then recheck current word.
75880
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
2245 `C-l': Redraw screen.
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
2246 `C-r': Recursive edit.
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
2247 `C-z': Suspend Emacs or iconify frame.")
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
2248 nil))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2249
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2250
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2251 (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
2252 "[i]nsert into private dictionary"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2253 (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
2254 "e[x/X]it; [q]uit session"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2255 (help-3 (concat "[u]ncapitalized insert into dict. "
54487
3bb6f178572c (ispell-help): Doc fix.
Juri Linkov <juri@jurta.org>
parents: 52401
diff changeset
2256 "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
2257 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2258 (if ispell-help-in-bufferp
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2259 (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
2260 (ispell-overlay-window 4)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2261 (switch-to-buffer (get-buffer-create "*Ispell Help*"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2262 (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
2263 (sit-for 5)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2264 (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
2265 (unwind-protect
59064
c674f42f1748 (ispell-help): Bind resize-mini-windows.
Richard M. Stallman <rms@gnu.org>
parents: 58494
diff changeset
2266 (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
2267 (select-window (minibuffer-window))
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2268 (erase-buffer)
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2269 (message nil)
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2270 ;;(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
2271 (enlarge-window 2)
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2272 (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
2273 (sit-for 5))
d91994a23659 (ispell-help): Clean up echo area if user quits.
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2274 (erase-buffer)))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2275
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2276
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2277 (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
2278 "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
2279 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
2280 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
2281 search for the words (usually egrep).
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2282
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2283 Optional second argument contains the dictionary to use; the default is
109161
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2284 `ispell-alternate-dictionary', overriden by `ispell-complete-word-dict'
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2285 if defined."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2286 ;; 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
2287 ;; 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
2288 (if (null lookup-dict)
109161
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2289 (setq lookup-dict (or ispell-complete-word-dict
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2290 ispell-alternate-dictionary)))
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2291
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2292 (if lookup-dict
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2293 (unless (file-readable-p lookup-dict)
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2294 (error "lookup-words error: Unreadable or missing plain word-list %s."
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
2295 lookup-dict))
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2296 (error (concat "lookup-words error: No plain word-list found at system"
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2297 "default locations. "
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2298 "Customize `ispell-alternate-dictionary' to set yours.")))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2299
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2300 (let* ((process-connection-type ispell-use-ptys-p)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2301 (wild-p (string-match "\\*" word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2302 (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
2303 (or ispell-have-new-look (not wild-p))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2304 (ispell-grep-buffer (get-buffer-create "*Ispell-Temp*")) ; result buf
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2305 (prog (if look-p ispell-look-command ispell-grep-command))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2306 (args (if look-p ispell-look-options ispell-grep-options))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2307 status results loc)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2308 (unwind-protect
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2309 (save-window-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2310 (message "Starting \"%s\" process..." (file-name-nondirectory prog))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2311 (set-buffer ispell-grep-buffer)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2312 (if look-p
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2313 nil
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2314 ;; convert * to .*
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2315 (insert "^" word "$")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2316 (while (search-backward "*" nil t) (insert "."))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2317 (setq word (buffer-string))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2318 (erase-buffer))
76633
32db7e65b617 (ispell-call-process): New function.
Richard M. Stallman <rms@gnu.org>
parents: 75882
diff changeset
2319 (setq status (apply 'ispell-call-process prog nil t nil
64965
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2320 (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
2321 (list args)
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2322 (if look-p nil
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2323 (list "-e")))
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2324 (list word)
008b8c9ce315 (lookup-words): Cope with case where ARGS is empty.
Richard M. Stallman <rms@gnu.org>
parents: 64855
diff changeset
2325 (if lookup-dict (list lookup-dict)))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2326 ;; grep returns status 1 and no output when word not found, which
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2327 ;; is a perfectly normal thing.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2328 (if (stringp status)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2329 (setq results (cons (format "error: %s exited with signal %s"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2330 (file-name-nondirectory prog) status)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2331 results))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2332 ;; else collect words into `results' in FIFO order
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2333 (goto-char (point-max))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2334 ;; assure we've ended with \n
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2335 (or (bobp) (= (preceding-char) ?\n) (insert ?\n))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2336 (while (not (bobp))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2337 (setq loc (point))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2338 (forward-line -1)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2339 (setq results (cons (buffer-substring-no-properties (point)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2340 (1- loc))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2341 results)))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2342 ;; protected
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2343 (kill-buffer ispell-grep-buffer)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2344 (if (and results (string-match ".+: " (car results)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2345 (error "%s error: %s" ispell-grep-command (car results))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2346 results))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2347
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2348
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2349 ;; "ispell-filter" is a list of output lines from the generating function.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2350 ;; Each full line (ending with \n) is a separate item on the list.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2351 ;; "output" can contain multiple lines, part of a line, or both.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2352 ;; "start" and "end" are used to keep bounds on lines when "output" contains
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2353 ;; multiple lines.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2354 ;; "ispell-filter-continue" is true when we have received only part of a
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2355 ;; line as output from a generating function ("output" did not end with \n)
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2356 ;; THIS FUNCTION WILL FAIL IF THE PROCESS OUTPUT DOESN'T END WITH \n!
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2357 ;; This is the case when a process dies or fails. The default behavior
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2358 ;; in this case treats the next input received as fresh input.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2359
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2360 (defun ispell-filter (process output)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2361 "Output filter function for ispell, grep, and look."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2362 (let ((start 0)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2363 (continue t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2364 end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2365 (while continue
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2366 (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
2367 ;; 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
2368 ;; are not continuing, treat the next item as a separate list. When
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2369 ;; ispell-filter-continue is asserted, ispell-filter *should* always be a
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2370 ;; list!
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2371
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2372 ;; Continue with same line (item)?
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2373 (if (and ispell-filter-continue ispell-filter (listp ispell-filter))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2374 ;; Yes. Add it to the prev item
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2375 (setcar ispell-filter
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2376 (concat (car ispell-filter) (substring output start end)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2377 ;; No. This is a new line and item.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2378 (setq ispell-filter
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2379 (cons (substring output start end) ispell-filter)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2380 (if (null end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2381 ;; We've completed reading the output, but didn't finish the line.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2382 (setq ispell-filter-continue t continue nil)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2383 ;; skip over newline, this line complete.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2384 (setq ispell-filter-continue nil end (1+ end))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2385 (if (= end (length output)) ; No more lines in output
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2386 (setq continue nil) ; so we can exit the filter.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2387 (setq start end)))))) ; else move start to next line of input
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2388
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2389
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2390 ;;; 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
2391 ;;; highlighted.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2392 (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
2393 refresh)
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2394 "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
2395 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
2396 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
2397 Uses block cursor to highlight one character.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2398 Optional REFRESH will unhighlighted then highlight, using block cursor
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2399 highlighting when REFRESH is equal to `block'."
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2400 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2401 (or (eq 'block refresh)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2402 (setq start (1+ start)))) ; On block non-refresh, inc start.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2403 (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
2404 (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
2405 (text (buffer-substring-no-properties start end)) ; Save hilight region
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2406 (inhibit-quit t) ; inhibit interrupt processing here.
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2407 (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
2408 (goto-char end)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2409 (delete-region start end)
14040
187735b53d52 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13337
diff changeset
2410 (insert-char ? (- end start)) ; minimize amount of redisplay
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2411 (sit-for 0) ; update display
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2412 (if highlight (setq inverse-video (not inverse-video))) ; toggle video
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2413 (delete-region start end) ; delete whitespace
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2414 (insert text) ; insert text in inverse video.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2415 (sit-for 0) ; update display showing inverse video.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2416 (if (not highlight)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2417 (goto-char end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2418 (setq inverse-video (not inverse-video)) ; toggle video
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2419 (and (eq 'block ispell-highlight-p)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2420 (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
2421 (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
2422 (and refresh ; re-highlight
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2423 (ispell-highlight-spelling-error-generic
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2424 (if (eq 'block refresh) start (- start 2)) end t))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2425
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2426
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2427 (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
2428 "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
2429 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
2430 otherwise it is displayed normally."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2431 (if highlight
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2432 (isearch-highlight start end)
60714
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2433 (isearch-dehighlight))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2434 ;;(sit-for 0)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2435 )
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2436
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2437
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2438 (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
2439 "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
2440 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
2441 otherwise it is displayed normally.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2442
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2443 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
2444 (if highlight
67427
055cc88a4fd0 (ispell-highlight-spelling-error-overlay):
Juri Linkov <juri@jurta.org>
parents: 66667
diff changeset
2445 (if ispell-overlay
055cc88a4fd0 (ispell-highlight-spelling-error-overlay):
Juri Linkov <juri@jurta.org>
parents: 66667
diff changeset
2446 (move-overlay ispell-overlay start end (current-buffer))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2447 (setq ispell-overlay (make-overlay start end))
67427
055cc88a4fd0 (ispell-highlight-spelling-error-overlay):
Juri Linkov <juri@jurta.org>
parents: 66667
diff changeset
2448 (overlay-put ispell-overlay 'priority 1001) ;higher than lazy overlays
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2449 (overlay-put ispell-overlay 'face ispell-highlight-face))
67427
055cc88a4fd0 (ispell-highlight-spelling-error-overlay):
Juri Linkov <juri@jurta.org>
parents: 66667
diff changeset
2450 (if ispell-overlay
055cc88a4fd0 (ispell-highlight-spelling-error-overlay):
Juri Linkov <juri@jurta.org>
parents: 66667
diff changeset
2451 (delete-overlay ispell-overlay)))
60714
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2452 (if (and ispell-lazy-highlight (boundp 'lazy-highlight-cleanup))
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2453 (if highlight
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2454 (let ((isearch-string
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2455 (concat
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2456 "\\b"
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2457 (regexp-quote (buffer-substring-no-properties start end))
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2458 "\\b"))
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2459 (isearch-regexp t)
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2460 (isearch-case-fold-search nil))
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2461 (isearch-lazy-highlight-new-loop
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2462 (if (boundp 'reg-start) reg-start)
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2463 (if (boundp 'reg-end) reg-end)))
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2464 (lazy-highlight-cleanup lazy-highlight-cleanup)
438b974e257c (ispell-lazy-highlight): New defcustom.
Juri Linkov <juri@jurta.org>
parents: 60530
diff changeset
2465 (setq isearch-lazy-highlight-last-string nil))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2466
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2467
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2468 (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
2469 (cond
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
2470 ((featurep 'xemacs)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2471 (ispell-highlight-spelling-error-xemacs start end highlight))
40412
acbdf8dbf6d4 (version18p, version20p): Vars deleted.
Richard M. Stallman <rms@gnu.org>
parents: 39186
diff changeset
2472 ((and (featurep 'faces)
30546
26e5d26a83ed (ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents: 29208
diff changeset
2473 (or (and (fboundp 'display-color-p) (display-color-p))
26e5d26a83ed (ispell-highlight-spelling-error): Use
Eli Zaretskii <eliz@gnu.org>
parents: 29208
diff changeset
2474 window-system))
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
2475 (ispell-highlight-spelling-error-overlay start end highlight))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2476 (t (ispell-highlight-spelling-error-generic start end highlight refresh))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2477
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2478 (defun ispell-adjusted-window-height (&optional window)
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2479 "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
2480 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
2481 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
2482 `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
2483 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
2484 `window-height'."
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2485 (cond ((fboundp 'window-text-height)
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2486 (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
2487 ((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
2488 (and (featurep 'xemacs) window-system))
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2489 (1- (window-height window)))
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2490 (t
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2491 (window-height window))))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2492
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2493 (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
2494 "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
2495 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
2496 scrolling the current window. Leave the new window selected."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2497 (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
2498 (let ((oldot (save-excursion (vertical-motion -1) (point)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2499 (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
2500 ;; If line above old point (line starting at oldot) would be
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2501 ;; hidden by new window, scroll it to just below new win
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2502 ;; otherwise set top line of other win so it doesn't scroll.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2503 (if (< oldot top) (setq top oldot))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2504 ;; if frame is unsplitable, temporarily disable that...
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2505 (if (cdr (assq 'unsplittable (frame-parameters (selected-frame))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2506 (let ((frame (selected-frame)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2507 (modify-frame-parameters frame '((unsplittable . nil)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2508 (split-window nil height)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2509 (modify-frame-parameters frame '((unsplittable . t))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2510 (split-window nil height))
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2511 (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
2512 (when (> deficit 0)
35221
20bc16b92eef (ispell-adjusted-window-height): New function.
Miles Bader <miles@gnu.org>
parents: 34632
diff changeset
2513 ;; 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
2514 ;; 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
2515 (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
2516 (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
2517 (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
2518 (setq top (min (point) oldot))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2519 (set-window-start (next-window) top))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2520
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2521
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2522 ;;; Should we add a compound word match return value?
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2523 (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
2524 "Parse the OUTPUT string from Ispell process and return:
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2525 1: t for an exact match.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2526 2: A string containing the root word matched via suffix removal.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2527 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
2528 (\"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
2529 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
2530 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
2531 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
2532 4: nil when an error has occurred.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2533
37007
4caced3e865e (ispell-parse-output): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 36815
diff changeset
2534 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
2535 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
2536 (cond
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2537 ((string= output "") t) ; for startup with pipes...
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2538 ((string= output "*") t) ; exact match
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2539 ((string= output "-") t) ; compound word match
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
2540 ((eq (aref output 0) ?+) ; found because of root word
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2541 (substring output 2)) ; return root word
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2542 ((equal 0 (string-match "[\ra-zA-Z]" output))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2543 (ding) ; error message from ispell!
65583
703495630901 Message format spec fixes (2)
Deepak Goel <deego@gnufans.org>
parents: 65571
diff changeset
2544 (message "Ispell error: %s" output)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2545 (sit-for 5)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2546 nil)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2547 (t ; need to process &, ?, and #'s
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
2548 (let ((type (aref output 0)) ; &, ?, or #
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2549 (original-word (substring output 2 (string-match " " output 2)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2550 (cur-count 0) ; contains number of misses + guesses
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2551 count miss-list guess-list offset)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2552 (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
2553 (if (eq type ?#)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2554 (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
2555 (setq count (string-to-number output) ; get number of misses.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2556 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
2557 (setq offset (string-to-number output))
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2558 (setq output (if (eq type ?#) ; No miss or guess list.
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2559 nil
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2560 (substring output (1+ (string-match " " output 1)))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2561 (while output
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2562 (let ((end (string-match ", \\|\\($\\)" output))) ; end of miss/guess.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2563 (setq cur-count (1+ cur-count))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2564 (if (> cur-count count)
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2565 (push (substring output 0 end) guess-list)
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2566 (push (substring output 0 end) miss-list))
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2567 (setq output (if (match-end 1) ; True only when at end of line.
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2568 nil ; No more misses or guesses.
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2569 (substring output (+ end 2))))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2570 ;; return results. Accept word if it was already accepted.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2571 ;; adjust offset.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2572 (if (member original-word accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2573 t
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2574 (list original-word
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2575 (if (numberp shift) (+ shift offset) offset)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2576 (nreverse miss-list) (nreverse guess-list)))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2577
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2578
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2579 (defun ispell-process-status ()
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2580 "Return the status of the Ispell process.
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2581 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
2582 (if ispell-async-processp
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2583 (process-status ispell-process)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2584 (and ispell-process 'run)))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2585
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2586
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2587 (defun ispell-start-process ()
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2588 "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
2589 Keeps argument list for future ispell invocations for no async support."
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2590 ;; Local dictionary becomes the global dictionary in use.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2591 (setq ispell-current-dictionary
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2592 (or ispell-local-dictionary ispell-dictionary))
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2593 (setq ispell-current-personal-dictionary
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2594 (or ispell-local-pdict ispell-personal-dictionary))
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2595 (let* ((default-directory
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2596 (if (and (file-directory-p default-directory)
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2597 (file-readable-p default-directory))
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2598 default-directory
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2599 ;; Defend against bad `default-directory'.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2600 (expand-file-name "~/")))
110263
280c5216180d Make sure original ispell arg list is initialized in (ispell-start-process).
Agustin martin <agustin.martin@hispalinux.es>
parents: 110183
diff changeset
2601 (orig-args (ispell-get-ispell-args))
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2602 (args
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2603 (append
110263
280c5216180d Make sure original ispell arg list is initialized in (ispell-start-process).
Agustin martin <agustin.martin@hispalinux.es>
parents: 110183
diff changeset
2604 (if (and ispell-current-dictionary ; Not for default dict (nil)
280c5216180d Make sure original ispell arg list is initialized in (ispell-start-process).
Agustin martin <agustin.martin@hispalinux.es>
parents: 110183
diff changeset
2605 (not (member "-d" orig-args))) ; Only define if not overridden.
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2606 (list "-d" ispell-current-dictionary))
110263
280c5216180d Make sure original ispell arg list is initialized in (ispell-start-process).
Agustin martin <agustin.martin@hispalinux.es>
parents: 110183
diff changeset
2607 orig-args
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2608 (if ispell-current-personal-dictionary ; Use specified pers dict.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2609 (list "-p"
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2610 (expand-file-name ispell-current-personal-dictionary)))
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2611 ;; If we are using recent aspell or hunspell, make sure we use the
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2612 ;; right encoding for communication. ispell or older aspell/hunspell
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2613 ;; does not support this.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2614 (if ispell-encoding8-command
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2615 (list
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2616 (concat ispell-encoding8-command
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2617 (symbol-name (ispell-get-coding-system)))))
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2618 ispell-extra-args)))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2619
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2620 ;; 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
2621 (setq ispell-buffer-local-name nil)
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2622
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2623 (if ispell-async-processp
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2624 (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
2625 (apply 'start-process
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2626 "ispell" nil ispell-program-name
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2627 "-a" ; Accept single input lines.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2628 ;; Make root/affix combos not in dict.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2629 ;; hunspell -m option means different.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2630 (if ispell-really-hunspell "" "-m")
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2631 args))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2632 (setq ispell-cmd-args args
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2633 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
2634 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
2635 (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
2636 t)))
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2637
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2638
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2639 (defun ispell-init-process ()
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2640 "Check status of Ispell process and start if necessary."
110151
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2641 (let* (;; Basename of dictionary used by the spell-checker
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2642 (dict-bname (or (car (cdr (member "-d" (ispell-get-ispell-args))))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2643 ispell-current-dictionary))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2644 ;; Use "~/" as default-directory unless using Ispell with per-dir
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2645 ;; personal dictionaries and not in a minibuffer under XEmacs
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2646 (default-directory
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2647 (if (or ispell-really-aspell
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2648 ispell-really-hunspell
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2649 ;; Protect against bad default-directory
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2650 (not (and (file-directory-p default-directory)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2651 (file-readable-p default-directory)))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2652 ;; Ispell and per-dir personal dicts available
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2653 (not (or (file-readable-p (concat default-directory
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2654 ".ispell_words"))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2655 (file-readable-p (concat default-directory
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2656 ".ispell_"
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2657 (or dict-bname
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2658 "default")))))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2659 ;; Ispell, in a minibuffer, and XEmacs
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2660 (and (window-minibuffer-p)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2661 (not (fboundp 'minibuffer-selected-window))))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2662 (expand-file-name "~/")
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2663 (expand-file-name default-directory))))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2664 ;; Check if process needs restart
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2665 (if (and ispell-process
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2666 (eq (ispell-process-status) 'run)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2667 ;; Unless we are using an explicit personal dictionary, ensure
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2668 ;; we're in the same default directory! Restart check for
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2669 ;; personal dictionary is done in
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2670 ;; `ispell-internal-change-dictionary', called from
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2671 ;; `ispell-buffer-local-dict'
110151
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2672 (or (or ispell-local-pdict ispell-personal-dictionary)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2673 (equal ispell-process-directory default-directory)))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2674 (setq ispell-filter nil ispell-filter-continue nil)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2675 ;; may need to restart to select new personal dictionary.
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2676 (ispell-kill-ispell t)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2677 (message "Starting new Ispell process [%s] ..."
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2678 (or ispell-local-dictionary ispell-dictionary "default"))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2679 (sit-for 0)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2680 (setq ispell-library-directory (ispell-check-version)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2681 ispell-process (ispell-start-process)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2682 ispell-filter nil
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2683 ispell-filter-continue nil
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2684 ispell-process-directory default-directory)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2685
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2686 (unless (equal ispell-process-directory (expand-file-name "~/"))
110301
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2687 ;; At this point, `ispell-process-directory' will be "~/" unless using
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2688 ;; Ispell with directory-specific dicts and not in XEmacs minibuffer.
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2689 ;; If not, kill ispell process when killing buffer. It may be in a
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2690 ;; removable device that would otherwise become un-mountable.
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2691 (with-current-buffer
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2692 (if (and (window-minibuffer-p) ;; In minibuffer
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2693 (fboundp 'minibuffer-selected-window)) ;; Not XEmacs.
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2694 ;; In this case kill ispell only when parent buffer is killed
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2695 ;; to avoid over and over ispell kill.
110151
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2696 (window-buffer (minibuffer-selected-window))
110301
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2697 (current-buffer))
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2698 ;; 'local does not automatically make hook buffer-local in XEmacs.
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2699 (if (featurep 'xemacs)
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2700 (make-local-hook 'kill-buffer-hook))
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2701 (add-hook 'kill-buffer-hook
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2702 (lambda () (ispell-kill-ispell t)) nil 'local)))
110151
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2703
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2704 (if ispell-async-processp
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2705 (set-process-filter ispell-process 'ispell-filter))
110301
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2706 ;; Protect against XEmacs bogus binding of `enable-multibyte-characters'.
110151
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2707 (if (and (or (featurep 'xemacs)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2708 (and (boundp 'enable-multibyte-characters)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2709 enable-multibyte-characters))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2710 (fboundp 'set-process-coding-system))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2711 (set-process-coding-system ispell-process (ispell-get-coding-system)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2712 (ispell-get-coding-system)))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2713 ;; Get version ID line
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2714 (ispell-accept-output 3)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2715 ;; get more output if filter empty?
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2716 (if (null ispell-filter) (ispell-accept-output 3))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2717 (cond ((null ispell-filter)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2718 (error "%s did not output version line" ispell-program-name))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2719 ((and
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2720 (stringp (car ispell-filter))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2721 (if (string-match "warning: " (car ispell-filter))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2722 (progn
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2723 (ispell-accept-output 3) ; was warn msg.
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2724 (stringp (car ispell-filter)))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2725 (null (cdr ispell-filter)))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2726 (string-match "^@(#) " (car ispell-filter)))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2727 ;; got the version line as expected (we already know it's the right
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2728 ;; version, so don't bother checking again.)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2729 nil)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2730 (t
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2731 ;; Otherwise, it must be an error message. Show the user.
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2732 ;; But first wait to see if some more output is going to arrive.
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2733 ;; Otherwise we get cool errors like "Can't open ".
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2734 (sleep-for 1)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2735 (ispell-accept-output 3)
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2736 (error "%s" (mapconcat 'identity ispell-filter "\n"))))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2737 (setq ispell-filter nil) ; Discard version ID line
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2738 (let ((extended-char-mode (ispell-get-extended-character-mode)))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2739 (if extended-char-mode ; ~ extended character mode
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2740 (ispell-send-string (concat extended-char-mode "\n"))))
728c823c045f ispell.el: better `default-directory' and kill-ispell-on-exit handling
Agustin martin <agustin.martin@hispalinux.es>
parents: 109161
diff changeset
2741 (if ispell-async-processp
111336
414281a5ab3c Silence ispell.el compilation.
Glenn Morris <rgm@gnu.org>
parents: 111297
diff changeset
2742 (if (featurep 'emacs)
110301
e59d99dc1c71 ispell.el: Improve comments. XEmacs compatibility changes.
Agustin martin <agustin.martin@hispalinux.es>
parents: 110265
diff changeset
2743 (set-process-query-on-exit-flag ispell-process nil)
111336
414281a5ab3c Silence ispell.el compilation.
Glenn Morris <rgm@gnu.org>
parents: 111297
diff changeset
2744 (if (fboundp 'set-process-query-on-exit-flag)
414281a5ab3c Silence ispell.el compilation.
Glenn Morris <rgm@gnu.org>
parents: 111297
diff changeset
2745 (set-process-query-on-exit-flag ispell-process nil)
414281a5ab3c Silence ispell.el compilation.
Glenn Morris <rgm@gnu.org>
parents: 111297
diff changeset
2746 (process-kill-without-query ispell-process)))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2747
6288
3197bf3cc0a1 (ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents: 6285
diff changeset
2748 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2749 (defun ispell-kill-ispell (&optional no-error)
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
2750 "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
2751 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
2752 (interactive)
68195
bb2dfb332355 (ispell-kill-ispell): Run new hook ispell-kill-ispell-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68169
diff changeset
2753 ;; 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
2754 ;; 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
2755 (run-hooks 'ispell-kill-ispell-hook)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2756 (if (not (and ispell-process
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2757 (eq (ispell-process-status) 'run)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2758 (or no-error
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2759 (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
2760 (if ispell-async-processp
71289
95f5febb2bb5 (ispell-kill-ispell): If ispell has been
Kim F. Storm <storm@cua.dk>
parents: 70814
diff changeset
2761 (delete-process ispell-process)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2762 ;; synchronous processes
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2763 (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
2764 (kill-buffer ispell-output-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2765 (kill-buffer ispell-session-buffer)
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2766 (setq ispell-output-buffer nil
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
2767 ispell-session-buffer nil))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2768 (setq ispell-process nil)
7592
c12c2c0c7d5f Lots of doc fixes and message syntax fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7585
diff changeset
2769 (message "Ispell process killed")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2770 nil))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2771
12260
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
2772 ;;; 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
2773 ;;; 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
2774
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2775 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2776 (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
2777 "Change to dictionary DICT for Ispell.
60284
196128d3d9e8 (ispell-change-dictionary): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 60182
diff changeset
2778 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
2779 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
2780
196128d3d9e8 (ispell-change-dictionary): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 60182
diff changeset
2781 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
2782 (interactive
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2783 (list (completing-read
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2784 "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
2785 (and (fboundp 'ispell-valid-dictionary-list)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2786 (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
2787 nil t)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2788 current-prefix-arg))
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
2789 (ispell-set-spellchecker-params) ; Initilize variables and dicts alists
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
2790 (unless arg (ispell-buffer-local-dict 'no-reload))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2791 (if (equal dict "default") (setq dict nil))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2792 ;; This relies on completing-read's bug of returning "" for no match
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2793 (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
2794 (ispell-internal-change-dictionary)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2795 (message "Using %s dictionary"
73080
30dd192351cc * textmodes/ispell.el (ispell-change-dictionary): Don't check the
Chong Yidong <cyd@stupidchicken.com>
parents: 72130
diff changeset
2796 (or (and (not arg) ispell-local-dictionary)
30dd192351cc * textmodes/ispell.el (ispell-change-dictionary): Don't check the
Chong Yidong <cyd@stupidchicken.com>
parents: 72130
diff changeset
2797 ispell-dictionary "default")))
30dd192351cc * textmodes/ispell.el (ispell-change-dictionary): Don't check the
Chong Yidong <cyd@stupidchicken.com>
parents: 72130
diff changeset
2798 ((equal dict (or (and (not arg) ispell-local-dictionary)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2799 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
2800 ;; 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
2801 ;; 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
2802 (ispell-internal-change-dictionary)
10697
d2fd1a6288b4 Personal dictionary save forced when called from menu,
Richard M. Stallman <rms@gnu.org>
parents: 10462
diff changeset
2803 (and (interactive-p)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2804 (message "No change, using %s dictionary" dict)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2805 (t ; reset dictionary!
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2806 (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
2807 (assoc dict ispell-dictionary-alist))
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2808 (if arg
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2809 ;; set default dictionary
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2810 (setq ispell-dictionary dict)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2811 ;; set local dictionary
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2812 (setq ispell-local-dictionary dict)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2813 (setq ispell-local-dictionary-overridden t))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2814 (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
2815 (ispell-internal-change-dictionary)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2816 (message "%s Ispell dictionary set to %s"
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2817 (if arg "Global" "Local")
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2818 dict))))
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2819
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2820 (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
2821 "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
2822 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
2823 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
2824 (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
2825 (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
2826 (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
2827 (equal ispell-current-personal-dictionary pdict))
67594
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
2828 (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
2829 (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
2830 ispell-current-personal-dictionary pdict))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2831
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2832 ;; Avoid error messages when compiling for these dynamic variables.
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2833 (defvar ispell-start)
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2834 (defvar ispell-end)
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2835
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2836 ;; Spelling of comments are checked when ispell-check-comments is non-nil.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2837
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2838 ;;;###autoload
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2839 (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
2840 "Interactively check a region for spelling errors.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2841 Return nil if spell session is quit,
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2842 otherwise returns shift offset amount for last line processed."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2843 (interactive "r") ; Don't flag errors on read-only bufs.
94303
e0b01f455de0 * ispell.el (ispell-set-spellchecker-params): New function to make sure
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93975
diff changeset
2844 (ispell-set-spellchecker-params) ; Initialize variables and dicts alists
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2845 (if (not recheckp)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2846 (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
2847 (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
2848 (rstart (make-marker)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2849 (unwind-protect
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2850 (save-excursion
85298
5f8ed0fbae95 (ispell-word): Call `ispell-region' on the active region in transient-mark-mode.
Juri Linkov <juri@jurta.org>
parents: 78482
diff changeset
2851 (message "Spell-checking %s using %s with %s dictionary..."
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2852 (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
2853 (buffer-name) "region")
64196
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
2854 (file-name-nondirectory ispell-program-name)
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
2855 (or ispell-current-dictionary "default"))
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
2856 ;; Returns cursor to original location.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2857 (save-window-excursion
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2858 (goto-char reg-start)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2859 (let ((transient-mark-mode)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2860 (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
2861 (query-fcc t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2862 in-comment key)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2863 (let (message-log-max)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2864 (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
2865 (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
2866 (progn
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2867 (setq key (match-string-no-properties 0))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2868 (set-marker skip-region-start (- (point) (length key)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2869 (goto-char reg-start)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2870 (let (message-log-max)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2871 (message
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2872 "Continuing spelling check using %s with %s dictionary..."
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2873 (file-name-nondirectory ispell-program-name)
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
2874 (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
2875 (set-marker rstart reg-start)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2876 (set-marker ispell-region-end reg-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2877 (while (and (not ispell-quit)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2878 (< (point) ispell-region-end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2879 ;; spell-check region with skipping
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2880 (if (and (marker-position skip-region-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2881 (<= skip-region-start (point)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2882 (progn
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2883 ;; 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
2884 (setq in-comment (point)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2885 in-comment
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2886 (and comment-start
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2887 (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
2888 (save-excursion
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2889 (beginning-of-line)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2890 (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
2891 comment-start))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2892 ;; 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
2893 (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
2894 (set-marker rstart (point))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2895 ;; 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
2896 (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
2897 (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
2898 rstart)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2899 (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
2900 (re-search-forward
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2901 (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
2902 ispell-region-end t))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2903 (progn
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
2904 (setq key (match-string-no-properties 0))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2905 (set-marker skip-region-start
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2906 (- (point) (length key)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2907 (goto-char rstart))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2908 (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
2909 (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
2910 (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
2911 (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
2912 (marker-position ispell-region-end))))
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2913 (let* ((ispell-start (point))
111445
56b71cddc9c5 Replace still more end-of-line etc with line-end-position, etc.
Glenn Morris <rgm@gnu.org>
parents: 111433
diff changeset
2914 (ispell-end (min (point-at-eol) reg-end))
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2915 (string (ispell-get-line
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2916 ispell-start ispell-end in-comment)))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2917 (if in-comment ; account for comment chars added
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2918 (setq ispell-start (- ispell-start (length in-comment))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2919 in-comment nil))
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2920 (setq ispell-end (point)) ; "end" tracks region retrieved.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2921 (if string ; there is something to spell check!
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2922 ;; (special start end)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2923 (setq shift (ispell-process-line string
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2924 (and recheckp shift))))
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
2925 (goto-char ispell-end)))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2926 (if ispell-quit
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2927 nil
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2928 (or shift 0)))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2929 ;; protected
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2930 (if (and (not (and recheckp ispell-keep-choices-win))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2931 (get-buffer ispell-choices-buffer))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2932 (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
2933 (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
2934 (set-marker rstart nil)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2935 (if ispell-quit
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2936 (progn
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2937 ;; preserve or clear the region for ispell-continue.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2938 (if (not (numberp ispell-quit))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2939 (set-marker ispell-region-end nil)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2940 ;; Ispell-continue enabled - ispell-region-end is set.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2941 (goto-char ispell-quit))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2942 ;; Check for aborting
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2943 (if (and ispell-checking-message (numberp ispell-quit))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2944 (progn
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2945 (setq ispell-quit nil)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2946 (error "Message send aborted")))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2947 (if (not recheckp) (setq ispell-quit nil)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
2948 (if (not recheckp) (set-marker ispell-region-end nil))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2949 ;; Only save if successful exit.
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
2950 (ispell-pdict-save ispell-silently-savep)
102249
3dbaa6c4f4cb * textmodes/ispell.el (ispell-region): Adapt "done" message
Juanma Barranquero <lekktu@gmail.com>
parents: 102028
diff changeset
2951 (message "Spell-checking %s using %s with %s dictionary...done"
85298
5f8ed0fbae95 (ispell-word): Call `ispell-region' on the active region in transient-mark-mode.
Juri Linkov <juri@jurta.org>
parents: 78482
diff changeset
2952 (if (and (= reg-start (point-min)) (= reg-end (point-max)))
5f8ed0fbae95 (ispell-word): Call `ispell-region' on the active region in transient-mark-mode.
Juri Linkov <juri@jurta.org>
parents: 78482
diff changeset
2953 (buffer-name) "region")
64196
9967974011d3 (ispell-command-loop): Add current dictionary name and program name
Juri Linkov <juri@jurta.org>
parents: 64084
diff changeset
2954 (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
2955 (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
2956
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2957
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2958 (defun ispell-begin-skip-region-regexp ()
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
2959 "Return a regexp of the search keys for region skipping.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2960 Includes `ispell-skip-region-alist' plus tex, tib, html, and comment keys.
75880
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
2961 Must call after `ispell-buffer-local-parsing' due to dependence on mode."
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2962 (mapconcat
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2963 'identity
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2964 (delq nil
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2965 (list
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2966 ;; messages
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2967 (if (and ispell-checking-message
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2968 (not (eq t ispell-checking-message)))
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2969 (mapconcat #'car ispell-checking-message "\\|"))
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2970 ;; tex
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2971 (if (eq ispell-parser 'tex)
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2972 (ispell-begin-tex-skip-regexp))
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2973 ;; html stuff
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2974 (if ispell-skip-html
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2975 (ispell-begin-skip-region ispell-html-skip-alists))
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2976 ;; tib
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2977 (if ispell-skip-tib ispell-tib-ref-beginning)
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2978 ;; Comments
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2979 (if (and (eq 'exclusive ispell-check-comments) comment-start)
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2980 ;; search from end of current comment to start of next comment.
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2981 (if (string= "" comment-end) "^" (regexp-quote comment-end)))
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2982 (if (and (null ispell-check-comments) comment-start)
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2983 (regexp-quote comment-start))
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2984 (ispell-begin-skip-region ispell-skip-region-alist)))
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
2985 "\\|"))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2986
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2987
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2988 (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
2989 "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
2990 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
2991 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
2992 (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
2993 skip-alist
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2994 "\\|"))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2995
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
2996
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
2997 (defun ispell-begin-tex-skip-regexp ()
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2998 "Regular expression of tex commands to skip.
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
2999 Generated from `ispell-tex-skip-alists'."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3000 (concat
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3001 ;; raw tex keys
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3002 (mapconcat (function (lambda (lst) (car lst)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3003 (car ispell-tex-skip-alists)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3004 "\\|")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3005 "\\|"
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3006 ;; keys wrapped in begin{}
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3007 (mapconcat (function (lambda (lst)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3008 (concat "\\\\begin[ \t\n]*{[ \t\n]*"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3009 (car lst)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3010 "[ \t\n]*}")))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3011 (car (cdr ispell-tex-skip-alists))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3012 "\\|")))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3013
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3014
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3015 (defun ispell-skip-region-list ()
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
3016 "Return a list describing key and body regions to skip for this buffer.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3017 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
3018 `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
3019 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
3020 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
3021 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
3022 (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
3023 ;; 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
3024 (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
3025 (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
3026 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
3027 (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
3028 skip-alist)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3029 (if ispell-skip-html
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3030 (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
3031 (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
3032 (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
3033 (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
3034 skip-alist))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3035
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3036
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3037 (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
3038 "Skip across ARG number of braces."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3039 (condition-case nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3040 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3041 (while (looking-at "[ \t\n]*\\[") (forward-sexp))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3042 (forward-sexp (or arg 1)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3043 (error
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3044 (message "error skipping s-expressions at point %d." (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3045 (beep)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3046 (sit-for 2))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3047
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3048
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3049 (defun ispell-ignore-fcc (start end)
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
3050 "Delete the Fcc: message header when large attachments are included.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3051 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
3052 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
3053 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
3054 (let ((result t))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3055 (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
3056 (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
3057 (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
3058 (goto-char (point-min))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3059 (setq head-end
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3060 (or (re-search-forward
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3061 (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
3062 nil t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3063 (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
3064 (point-min)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3065 (goto-char (point-min))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3066 (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
3067 (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
3068 "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
3069 (setq result nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3070 (beginning-of-line)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3071 (kill-line 1)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3072 (goto-char end))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3073 result))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3074
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3075
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3076 (defun ispell-skip-region (key)
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
3077 "Skip across KEY and then to end of region.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3078 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
3079 Point is placed at end of skipped region."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3080 ;; move over key to begin checking.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3081 (forward-char (length key))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3082 (let ((start (point))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3083 ;; 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
3084 (alist (ispell-skip-region-list))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3085 alist-key null-skip)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3086 (cond
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3087 ;; what about quoted comment, or comment inside strings?
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3088 ((and (null ispell-check-comments) comment-start
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3089 (string= key comment-start))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3090 (if (string= "" comment-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3091 (forward-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3092 (search-forward comment-end ispell-region-end t)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3093 ((and (eq 'exclusive ispell-check-comments) comment-start
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3094 (string= key comment-end))
22526
56bcedfdbe83 (ispell-skip-region): Don't complain when
Karl Heuer <kwzh@gnu.org>
parents: 22461
diff changeset
3095 (search-forward comment-start ispell-region-end :end))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3096 ((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
3097 (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
3098 ;; markings from alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3099 (t
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3100 (while alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3101 (setq alist-key (eval (car (car alist))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3102 (if (string-match alist-key key)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3103 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3104 (setq alist (cdr (car alist)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3105 (cond
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3106 ((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
3107 ((not (consp alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3108 ;; 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
3109 (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
3110 ((and (= 1 (length alist))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3111 (stringp (car alist)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3112 (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
3113 (t
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3114 (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
3115 (if (consp (cdr alist))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3116 (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
3117 (funcall (car alist)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3118 (setq alist nil))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3119 (setq alist (cdr alist))))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3120 (if (and (= start (point)) (null null-skip))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3121 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3122 (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
3123 key (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3124 (beep)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3125 (sit-for 2)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3126
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3127
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3128 (defun ispell-get-line (start end in-comment)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
3129 "Grab the next line of data.
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
3130 Returns a string with the line data."
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3131 (let ((ispell-casechars (ispell-get-casechars))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3132 string)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3133 (cond ; LOOK AT THIS LINE AND SKIP OR PROCESS
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3134 ((eolp) ; END OF LINE, just go to next line.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3135 (forward-line))
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3136 ;;((looking-at "[-#@*+!%~^]") ; SKIP SPECIAL ISPELL CHARACTERS
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3137 ;; (forward-char 1)) ; not needed as quoted below.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3138 ((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
3139 (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
3140 (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
3141 (buffer-substring-no-properties start end)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3142 "\n"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3143 (goto-char end))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3144 (t (goto-char end))) ; EMPTY LINE, skip it.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3145 string))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3146
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3147
59627
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
3148 (defun ispell-looking-at (string)
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
3149 (let ((coding (ispell-get-coding-system))
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
3150 (len (length string)))
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
3151 (and (<= (+ (point) len) (point-max))
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
3152 (equal (encode-coding-string string coding)
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
3153 (encode-coding-string (buffer-substring-no-properties
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
3154 (point) (+ (point) len))
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
3155 coding)))))
24c3aed806c6 (ispell-looking-at): New function.
Kenichi Handa <handa@m17n.org>
parents: 59510
diff changeset
3156
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3157 (defun ispell-process-line (string shift)
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
3158 "Send STRING, a line of text, to ispell and processes the result.
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3159 This will modify the buffer for spelling errors.
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3160 Requires variables ISPELL-START and ISPELL-END to be defined in its
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3161 dynamic scope.
75880
7717e4bf7aef (ispell-keep-choices-win, ispell-dictionary-alist, ispell-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
3162 Returns the sum SHIFT due to changes in word replacements."
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3163 ;;(declare special ispell-start ispell-end)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3164 (let (poss accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3165 (if (not (numberp shift))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3166 (setq shift 0))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3167 ;; 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
3168 (ispell-send-string string)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3169 (while (progn
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3170 (ispell-accept-output)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3171 ;; Last item of output contains a blank line.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3172 (not (string= "" (car ispell-filter)))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3173 ;; 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
3174 ;; Place in FIFO order and remove the blank item.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3175 (setq ispell-filter (nreverse (cdr ispell-filter)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3176 (while (and (not ispell-quit) ispell-filter)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3177 ;; get next word, accounting for accepted words and start shifts
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3178 (setq poss (ispell-parse-output (car ispell-filter)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3179 accept-list shift))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3180 (if (and poss (listp poss)) ; spelling error occurred.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3181 ;; Whenever we have misspellings, we can change
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3182 ;; the buffer. Keep boundaries as markers.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3183 ;; Markers can move with highlighting! This destroys
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3184 ;; 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
3185 (let ((word-start
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3186 (copy-marker (+ ispell-start ispell-offset (car (cdr poss)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3187 (word-len (length (car poss)))
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3188 (line-end (copy-marker ispell-end))
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3189 (line-start (copy-marker ispell-start))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3190 recheck-region replace)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3191 (goto-char word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3192 ;; Adjust the horizontal scroll & point
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3193 (ispell-horiz-scroll)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3194 (goto-char (+ word-len word-start))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3195 (ispell-horiz-scroll)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3196 (goto-char word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3197 (ispell-horiz-scroll)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3198
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3199 ;; Alignment cannot be tracked and this error will occur when
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3200 ;; `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
3201 (or (ispell-looking-at (car poss))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3202 ;; This occurs due to filter pipe problems
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3203 (error (concat "Ispell misalignment: word "
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3204 "`%s' point %d; probably incompatible versions")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3205 (car poss) (marker-position word-start)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3206 ;; ispell-cmd-loop can go recursive & change buffer
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3207 (if ispell-keep-choices-win
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3208 (setq replace (ispell-command-loop
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3209 (car (cdr (cdr poss)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3210 (car (cdr (cdr (cdr poss))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3211 (car poss) (marker-position word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3212 (+ word-len (marker-position word-start))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3213 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3214 (setq replace (ispell-command-loop
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3215 (car (cdr (cdr poss)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3216 (car (cdr (cdr (cdr poss))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3217 (car poss) (marker-position word-start)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3218 (+ word-len (marker-position word-start))))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3219
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3220 (goto-char word-start)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3221 ;; Recheck when query replace edit changes misspelled word.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3222 ;; 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
3223 (if (and replace (listp replace) (= 2 (length replace)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3224 (if (and (eq ispell-parser 'tex)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3225 (string-match "[\\\\][]()[]\\|\\\\begin\\|\\$"
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3226 (regexp-quote string)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3227 (error
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3228 "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
3229 )
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3230 (set-marker line-end (point))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3231 (setq ispell-filter nil
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3232 recheck-region t)))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3233
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3234 ;; insert correction if needed
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3235 (cond
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3236 ((or (null replace)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3237 (equal 0 replace)) ; ACCEPT/INSERT
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3238 (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3239 (ispell-add-per-file-word-list (car poss)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3240 ;; do not recheck accepted word on this line
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3241 (setq accept-list (cons (car poss) accept-list)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3242 (t ; replacement word selected or entered
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3243 (delete-region (point) (+ word-len (point)))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3244 (if (not (listp replace))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3245 (progn
94382
d97dbf46a59a (ispell-insert-word): Revert previous change.
Glenn Morris <rgm@gnu.org>
parents: 94365
diff changeset
3246 (ispell-insert-word replace) ; insert dictionary word
56932
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
3247 (ispell-send-replacement (car poss) replace)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3248 (setq accept-list (cons replace accept-list)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3249 (let ((replace-word (car replace)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3250 ;; Recheck hand entered replacement word
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3251 (insert replace-word)
56932
09766a703f68 (ispell-really-aspell): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56875
diff changeset
3252 (ispell-send-replacement (car poss) replace-word)
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3253 (if (car (cdr replace))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3254 (save-window-excursion
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3255 (delete-other-windows) ; to correctly show help.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3256 ;; Assume case-replace &
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3257 ;; case-fold-search correct?
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3258 (query-replace (car poss) (car replace) t)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3259 (goto-char word-start)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3260 ;; do not recheck if already accepted
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3261 (if (member replace-word accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3262 (setq accept-list (cons replace-word accept-list)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3263 replace replace-word)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3264 (let ((region-end (copy-marker ispell-region-end)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3265 (setq recheck-region ispell-filter
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3266 ispell-filter nil ; save filter
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3267 shift 0 ; already accounted
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3268 shift (ispell-region
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3269 word-start
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3270 (+ word-start (length replace-word))
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3271 t shift))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3272 (if (null shift) ; quitting check.
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3273 (setq shift 0))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3274 (set-marker ispell-region-end region-end)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3275 (set-marker region-end nil)
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3276 (setq ispell-filter recheck-region
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3277 recheck-region nil
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3278 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
3279
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3280 (setq shift (+ shift (- (length replace) word-len)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3281
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3282 ;; Move line-start across word...
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3283 ;; new shift function does this now...
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3284 ;;(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
3285 ;; (- (length replace)
313ef0d76864 (ispell-menu-map-needed): Check that ispell-process
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28563
diff changeset
3286 ;; (length (car poss)))))
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3287 ))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3288 (if (not ispell-quit)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
3289 ;; FIXME: remove redundancy with identical code above.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3290 (let (message-log-max)
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
3291 (message
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
3292 "Continuing spelling check using %s with %s dictionary..."
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
3293 (file-name-nondirectory ispell-program-name)
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
3294 (or ispell-current-dictionary "default"))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3295 (sit-for 0)
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3296 (setq ispell-start (marker-position line-start)
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3297 ispell-end (marker-position line-end))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3298 ;; Adjust markers when end of region lost from highlighting.
110445
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3299 (if (and (not recheck-region)
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3300 (< ispell-end (+ word-start word-len)))
8035d26918c9 * lisp/textmodes/ispell.el (ispell-start, ispell-end): Rename from `start'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110443
diff changeset
3301 (setq ispell-end (+ word-start word-len)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3302 (if (= word-start ispell-region-end)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3303 (set-marker ispell-region-end (+ word-start word-len)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3304 ;; going out of scope - unneeded
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3305 (set-marker line-start nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3306 (set-marker word-start nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3307 (set-marker line-end nil)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3308 ;; finished with misspelling!
27260
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3309 (setq ispell-filter (cdr ispell-filter)))
ec1a21729421 (xemacsp, version18p, version-20p):
Gerd Moellmann <gerd@gnu.org>
parents: 27009
diff changeset
3310 shift))
21873
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
20389
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3313 ;;;###autoload
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3314 (defun ispell-comments-and-strings ()
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3315 "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
3316 (interactive)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3317 (goto-char (point-min))
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3318 (let (state done)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3319 (while (not done)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3320 (setq done t)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3321 (setq state (parse-partial-sexp (point) (point-max)
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3322 nil nil state 'syntax-table))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3323 (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
3324 (let ((start (point)))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3325 (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
3326 nil nil state 'syntax-table))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3327 (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
3328 (error "Unterminated string or comment"))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3329 (save-excursion
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3330 (setq done (not (ispell-region start (point))))))))))
20389
e15a9b5e0a70 New function ispell-comments-and-strings.
Gerd Moellmann <gerd@gnu.org>
parents: 20089
diff changeset
3331
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3332
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3333 ;;;###autoload
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3334 (defun ispell-buffer ()
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3335 "Check the current buffer for spelling errors interactively."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3336 (interactive)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3337 (ispell-region (point-min) (point-max)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3338
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3339
6288
3197bf3cc0a1 (ispell-pdict-save, ispell-kill-ispell, ispell-continue):
Richard M. Stallman <rms@gnu.org>
parents: 6285
diff changeset
3340 ;;;###autoload
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3341 (defun ispell-continue ()
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3342 "Continue a halted spelling session beginning with the current word."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3343 (interactive)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3344 (if (not (marker-position ispell-region-end))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3345 (message "No session to continue. Use 'X' command when checking!")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3346 (if (not (equal (marker-buffer ispell-region-end) (current-buffer)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3347 (message "Must continue ispell from buffer %s"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3348 (buffer-name (marker-buffer ispell-region-end)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3349 (ispell-region
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3350 ;; find beginning of current word:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3351 (car (cdr (ispell-get-word t)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3352 (marker-position ispell-region-end)))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3353
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3354
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3355 ;;; Horizontal scrolling
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3356 (defun ispell-horiz-scroll ()
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
3357 "Place point within the horizontal visibility of its window area."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3358 (if truncate-lines ; display truncating lines?
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3359 ;; See if display needs to be scrolled.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3360 (let ((column (- (current-column) (max (window-hscroll) 1))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3361 (if (and (< column 0) (> (window-hscroll) 0))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3362 (scroll-right (max (- column) 10))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3363 (if (>= column (- (window-width) 2))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3364 (scroll-left (max (- column (window-width) -3) 10)))))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3365
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3366
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3367 ;;; Interactive word completion.
110183
fe4f125a5ff8 Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110151
diff changeset
3368 ;; Forces "previous-word" processing. Do we want to make this selectable?
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3369
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3370 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3371 (defun ispell-complete-word (&optional interior-frag)
41949
66bf9fec7803 (ispell-complete-word): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 41937
diff changeset
3372 "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
3373 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
3374 sequence inside of a word.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3375
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3376 Standard ispell choices are then available."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3377 (interactive "P")
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3378 (let ((cursor-location (point))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3379 (case-fold-search-val case-fold-search)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3380 (word (ispell-get-word nil "\\*")) ; force "previous-word" processing.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3381 start end possibilities replacement)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3382 (setq start (car (cdr word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3383 end (car (cdr (cdr word)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3384 word (car word)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3385 possibilities
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3386 (or (string= word "") ; Will give you every word
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3387 (lookup-words (concat (and interior-frag "*") word
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3388 (if (or interior-frag (null ispell-look-p))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3389 "*"))
109161
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
3390 (or ispell-complete-word-dict
2f63c33b2618 Improve ispell.el word completion handling.
Agustin martin <agustin.martin@hispalinux.es>
parents: 109047
diff changeset
3391 ispell-alternate-dictionary))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3392 (cond ((eq possibilities t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3393 (message "No word to complete"))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3394 ((null possibilities)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3395 (message "No match for \"%s\"" word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3396 (t ; There is a modification...
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3397 (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
3398 (cond
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3399 ((string-equal (upcase word) word)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3400 (setq possibilities (mapcar 'upcase possibilities)))
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
3401 ((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
3402 (setq possibilities (mapcar (function
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3403 (lambda (pos)
50988
f4923c2899b6 (xemacsp): Remove. Replace with (featurep 'xemacs).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49599
diff changeset
3404 (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
3405 pos
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3406 (capitalize pos))))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3407 possibilities))))
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3408 (setq case-fold-search case-fold-search-val)
9416
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
3409 (save-window-excursion
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
3410 (setq replacement
e916757c9acc (ispell-highlight-spelling-error):
Richard M. Stallman <rms@gnu.org>
parents: 9201
diff changeset
3411 (ispell-command-loop possibilities nil word start end)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3412 (cond
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3413 ((equal 0 replacement) ; BUFFER-LOCAL ADDITION
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3414 (ispell-add-per-file-word-list word))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3415 (replacement ; REPLACEMENT WORD
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3416 (delete-region start end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3417 (setq word (if (atom replacement) replacement (car replacement))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3418 cursor-location (+ (- (length word) (- end start))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3419 cursor-location))
94382
d97dbf46a59a (ispell-insert-word): Revert previous change.
Glenn Morris <rgm@gnu.org>
parents: 94365
diff changeset
3420 (ispell-insert-word word)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3421 (if (not (atom replacement)) ; recheck spelling of replacement.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3422 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3423 (goto-char cursor-location)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3424 (ispell-word nil t)))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3425 (if (get-buffer ispell-choices-buffer)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3426 (kill-buffer ispell-choices-buffer))))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3427 (ispell-pdict-save ispell-silently-savep)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3428 (goto-char cursor-location)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3429
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3430
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3431 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3432 (defun ispell-complete-word-interior-frag ()
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3433 "Completes word matching character sequence inside a word."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3434 (interactive)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3435 (ispell-complete-word t))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3436
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
3437
30563
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3438 ;;;###autoload
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3439 (defun ispell ()
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3440 "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
3441 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
3442 that region. Otherwise spell-check the buffer.
243429d5e6d2 (ispell): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34131
diff changeset
3443
243429d5e6d2 (ispell): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34131
diff changeset
3444 Ispell dictionaries are not distributed with Emacs. If you are
243429d5e6d2 (ispell): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34131
diff changeset
3445 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
3446 program, or do an Internet search; there are various dictionaries
243429d5e6d2 (ispell): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34131
diff changeset
3447 available on the net."
30563
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3448 (interactive)
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3449 (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
3450 (boundp 'mark-active) mark-active)
30563
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3451 (ispell-region (region-beginning) (region-end))
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3452 (ispell-buffer)))
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3453
a8130a547f56 (ispell): New function, replacing an alias.
Gerd Moellmann <gerd@gnu.org>
parents: 30546
diff changeset
3454
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3455 ;;; **********************************************************************
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3456 ;;; Ispell Minor Mode
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3457 ;;; **********************************************************************
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3458
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3459 (defvar ispell-minor-keymap
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3460 (let ((map (make-sparse-keymap)))
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3461 (define-key map " " 'ispell-minor-check)
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3462 (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
3463 map)
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3464 "Keymap used for Ispell minor mode.")
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3465
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3466 ;;;###autoload
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3467 (define-minor-mode ispell-minor-mode
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3468 "Toggle Ispell minor mode.
78482
80e300a489d6 Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78225
diff changeset
3469 With prefix argument ARG, turn Ispell minor mode on if ARG is positive,
80e300a489d6 Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78225
diff changeset
3470 otherwise turn it off.
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3471
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3472 In Ispell minor mode, pressing SPC or RET
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3473 warns you if the previous word is incorrectly spelled.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3474
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3475 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
3476 them into the running ispell process, type \\[ispell-word] SPC."
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3477 nil " Spell" ispell-minor-keymap)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3478
8803
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3479 (defun ispell-minor-check ()
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3480 "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
3481 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
3482 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
3483 (interactive "*")
18bf41f29a7d (ispell-highlight-spelling-error): Test window-system.
Richard M. Stallman <rms@gnu.org>
parents: 8725
diff changeset
3484 (let ((ispell-minor-mode nil)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3485 (ispell-check-only t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3486 (last-char (char-after (1- (point)))))
24701
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3487 (command-execute (key-binding (this-command-keys)))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3488 (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
3489 (and ispell-skip-html (eq last-char ?>))
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3490 (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
3491 (ispell-word nil t))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3492
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
3493
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3494 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3495 ;;; Ispell Message
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3496 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3497
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3498 (defvar ispell-message-text-end
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3499 (mapconcat (function identity)
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3500 '(
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3501 ;; Don't spell check signatures
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3502 "^-- $"
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3503 ;; Matches postscript files.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3504 ;;"^%!PS-Adobe-[123].0"
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3505 ;; Matches uuencoded text
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3506 ;;"^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
3507 ;; Matches shell files (especially auto-decoding)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
3508 "^#! /bin/[ck]?sh"
8387
7dca276b66d8 (ispell-message-text-end): Improve context diff regexp.
Richard M. Stallman <rms@gnu.org>
parents: 8298
diff changeset
3509 ;; Matches context difference listing
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3510 "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3511 ;; Matches unidiff difference listing
107074
e4a4161df485 * textmodes/ispell.el (ispell-message-text-end): Remove final newline
Juri Linkov <juri@jurta.org>
parents: 106840
diff changeset
3512 "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@"
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3513 ;; Matches reporter.el bug report
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3514 "^current state:\n==============\n"
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3515 ;; Matches commonly used "cut" boundaries
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3516 "^\\(- \\)?[-=_]+\\s ?\\(cut here\\|Environment Follows\\)")
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3517 "\\|")
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3518 "*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
3519 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
3520 Otherwise, it must be a function which is called to get the limit.")
70814
6a91e8b1eea0 (ispell-format-word): Make this the alias for the following variable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70398
diff changeset
3521 (put 'ispell-message-text-end 'risky-local-variable t)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3522
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3523
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3524 (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
3525 "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
3526 ;; 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
3527 (and
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3528 (re-search-forward
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3529 "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
3530 limit t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3531 (let (boundary)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3532 (if (looking-at "\"")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3533 (let (start)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3534 (forward-char)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3535 (setq start (point))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3536 (while (not (looking-at "\""))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3537 (forward-char 1))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3538 (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
3539 (let ((start (point)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3540 (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
3541 (forward-char))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3542 (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
3543 (if (< (length boundary) 1)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3544 (setq boundary nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3545 (concat "--" boundary)))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3546
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3547
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3548 (defun ispell-mime-skip-part (boundary)
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
3549 "Move point across header, or entire MIME part if message is encoded.
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3550 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
3551 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
3552 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
3553
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3554 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
3555 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
3556 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
3557 (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
3558 (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
3559 (continuep t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3560 textp)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3561 (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
3562 ispell-skip-html nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3563 (while continuep
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3564 (setq continuep nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3565 (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
3566 (progn
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3567 (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
3568 (if (looking-at "html")
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3569 (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
3570 (setq textp t
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3571 continuep t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3572 (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
3573 (forward-line)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3574 (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
3575 (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
3576 (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
3577 ;; 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
3578 '("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
3579 continuep t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3580 (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
3581 (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
3582 (forward-line)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3583 ;; hierarchical boundary definition
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3584 (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
3585 (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
3586 (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
3587 (setq continuep t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3588 ;; 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
3589 ;;(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
3590 (forward-line)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3591 (setq ispell-checking-message
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3592 (cons
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3593 (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
3594 (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
3595 ispell-checking-message))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3596 textp t
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3597 continuep t)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3598 ;; 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
3599 (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
3600 (progn
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3601 (setq continuep t)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3602 (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
3603 (forward-line)))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3604
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3605 (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
3606 (if textp
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3607 (point)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3608 ;; 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
3609 (if (not boundary)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3610 (goto-char (point-max))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3611 (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
3612 (beginning-of-line)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3613 (point)))))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3614
12260
5b8203bdfd6a Removed autoload from ispell-dictionary-alist,
Richard M. Stallman <rms@gnu.org>
parents: 11956
diff changeset
3615
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3616 ;;;###autoload
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3617 (defun ispell-message ()
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3618 "Check the spelling of a mail message or news post.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3619 Don't check spelling of message headers except the Subject field.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3620 Don't check included messages.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3621
15551
9cbd488c1872 (ispell-message): Support message-mode.
Richard M. Stallman <rms@gnu.org>
parents: 15312
diff changeset
3622 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
3623 use the `x' command. (Any subsequent regions will be checked.)
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
3624 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
3625
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3626 To spell-check whenever a message is sent, include the appropriate lines
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3627 in your .emacs file:
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3628 (add-hook 'message-send-hook 'ispell-message) ;; GNUS 5
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3629 (add-hook 'news-inews-hook 'ispell-message) ;; GNUS 4
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3630 (add-hook 'mail-send-hook 'ispell-message)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3631 (add-hook 'mh-before-send-letter-hook 'ispell-message)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3632
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
3633 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
3634 `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
3635 (function (lambda () (local-set-key \"\\C-ci\" 'ispell-message)))"
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3636 (interactive)
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3637 (save-excursion
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3638 (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
3639 (let* (boundary mimep
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3640 (ispell-skip-region-alist-save ispell-skip-region-alist)
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3641 ;; Nil when message came from outside (eg calling Emacs as editor)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3642 ;; Non-nil marker of end of headers.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3643 (internal-messagep
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3644 (re-search-forward
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3645 (concat "^" (regexp-quote mail-header-separator) "$") nil t))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3646 (end-of-headers ; Start of body.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3647 (copy-marker
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3648 (or internal-messagep
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3649 (re-search-forward "^$" nil t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3650 (point-min))))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3651 (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
3652 (cond
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3653 ((not ispell-message-text-end) (point-max))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3654 ((char-or-string-p ispell-message-text-end)
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3655 (if (re-search-forward ispell-message-text-end nil t)
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3656 (match-beginning 0)
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3657 (point-max)))
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3658 (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
3659 (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
3660 (if (and (boundp 'mail-yank-prefix) mail-yank-prefix)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3661 (ispell-non-empty-string mail-yank-prefix)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3662 " \\|\t"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3663 (cite-regexp ;Prefix of quoted text
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3664 (cond
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3665 ((functionp 'sc-cite-regexp) ; sc 3.0
86242
aab1a93c03ca * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85378
diff changeset
3666 (with-no-warnings
aab1a93c03ca * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85378
diff changeset
3667 (concat "\\(" (sc-cite-regexp) "\\)" "\\|"
aab1a93c03ca * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85378
diff changeset
3668 (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
3669 ((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
3670 (concat "\\(" sc-cite-regexp "\\)" "\\|"
57516
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3671 (with-no-warnings
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3672 (ispell-non-empty-string sc-reference-tag-string))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3673 ((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
3674 (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
3675 (concat "In article <" "\\|"
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3676 "[^,;&+=\n]+ <[^,;&+=]+> writes:" "\\|"
57516
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3677 (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
3678 "\\|"
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3679 default-prefix))
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3680 ((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
3681 (concat "[^,;&+=\n]+ writes:" "\\|"
57516
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3682 (with-no-warnings
3d3c9896482e (ispell-command-loop): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 56932
diff changeset
3683 (ispell-non-empty-string mh-ins-buf-prefix))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3684 ((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
3685 (concat "In [a-zA-Z.]+ you write:" "\\|"
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3686 "In <[^,;&+=]+> [^,;&+=]+ writes:" "\\|"
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3687 " *> *"))
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3688 ((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
3689 (concat "[^,;&+=\n]+ writes:" "\\|"
6139
120970aa0d16 (ispell-message-text-end): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 6138
diff changeset
3690 (ispell-non-empty-string vm-included-text-prefix)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3691 (t default-prefix)))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3692 (ispell-skip-region-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3693 (cons (list (concat "^\\(" cite-regexp "\\)")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3694 (function forward-line))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3695 ispell-skip-region-alist))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3696 (old-case-fold-search case-fold-search)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3697 (dictionary-alist ispell-message-dictionary-alist)
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3698 (ispell-checking-message t))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3699
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3700 ;; Select dictionary for message
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3701 (or (local-variable-p 'ispell-local-dictionary (current-buffer))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3702 (while dictionary-alist
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3703 (goto-char (point-min))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3704 (if (re-search-forward (car (car dictionary-alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3705 end-of-headers t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3706 (setq ispell-local-dictionary (cdr (car dictionary-alist))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3707 dictionary-alist nil)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3708 (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
3709
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3710 (unwind-protect
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3711 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3712 ;; Spell check any original Subject:
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3713 (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
3714 (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
3715 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
3716 (goto-char (point-min))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3717 (if (re-search-forward "^Subject: *" end-of-headers t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3718 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3719 (goto-char (match-end 0))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3720 (if (and (not (looking-at ".*Re\\>"))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3721 (not (looking-at "\\[")))
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3722 (progn
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3723 (setq case-fold-search old-case-fold-search)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3724 (ispell-region (point)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3725 (progn ;Tab-initiated continuation lns.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3726 (end-of-line)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3727 (while (looking-at "\n[ \t]")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3728 (end-of-line 2))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3729 (point)))))))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3730 (if mimep
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3731 (progn
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3732 (goto-char (point-min))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3733 (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
3734 ;; 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
3735 (and boundary
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3736 (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
3737 (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
3738 (< (point) (marker-position limit))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3739 (set-marker limit (point)))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3740 (goto-char (point-min))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3741 ;; 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
3742 ;; Point moved to end of buffer if region is encoded.
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3743 (when (and mimep (not boundary))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3744 (goto-char (point-min))
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3745 (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
3746 (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
3747 (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
3748 ;; 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
3749 (if (> (point) limit)
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3750 (set-marker limit (point))))
51151
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3751 (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
3752 (forward-line 1)
23791
364d36c8f631 Improved and fixed customize for variables:
Richard M. Stallman <rms@gnu.org>
parents: 23692
diff changeset
3753 (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
3754 ;; 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
3755 (if boundary
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3756 (setq ispell-checking-message
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3757 (list (list boundary 'ispell-mime-skip-part boundary))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3758 (ispell-region (point) limit))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3759 (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
3760 (set-marker limit nil)
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3761 (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
3762 ispell-skip-html nil
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3763 case-fold-search old-case-fold-search)))))
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3764
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3765
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3766 (defun ispell-non-empty-string (string)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3767 (if (or (not string) (string-equal string ""))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3768 "\\'\\`" ; An unmatchable string if string is null.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3769 (regexp-quote string)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3770
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3771
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3772 ;;; **********************************************************************
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3773 ;;; Buffer Local Functions
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3774 ;;; **********************************************************************
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 (defun ispell-accept-buffer-local-defs ()
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3778 "Load all buffer-local information, restarting Ispell when necessary."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3779 (ispell-buffer-local-dict) ; May kill ispell-process.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3780 (ispell-buffer-local-words) ; Will initialize ispell-process.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3781 (ispell-buffer-local-parsing))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3782
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3783
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3784 (defun ispell-buffer-local-parsing ()
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
3785 "Place Ispell into parsing mode for this buffer.
7606
3cc5ac274660 Lucid menu added.
Richard M. Stallman <rms@gnu.org>
parents: 7592
diff changeset
3786 Overrides the default parsing mode.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3787 Includes Latex/Nroff modes and extended character mode."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3788 ;; (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
3789 (ispell-send-string "!\n") ; Put process in terse mode.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3790 ;; 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
3791 ;; 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
3792 (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
3793 (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
3794 (string-match "[Tt][Ee][Xx]-mode"
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3795 (symbol-name major-mode)))
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3796 (eq ispell-parser 'tex)))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3797 (progn
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3798 (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
3799 (if (not (eq ispell-parser 'tex))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3800 (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
3801 (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
3802 ;; 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
3803 (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
3804 (setq ispell-skip-html
fe11e703042b Summary: MIME support added for e-mail processing that
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50988
diff changeset
3805 (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
3806 (downcase (symbol-name major-mode)))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3807 ;; Set default extended character mode for given buffer, if any.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3808 (let ((extended-char-mode (ispell-get-extended-character-mode)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3809 (if extended-char-mode
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3810 (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
3811 ;; Set buffer-local parsing mode and extended character mode, if specified.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3812 (save-excursion
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3813 (goto-char (point-max))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3814 ;; Uses last occurrence of ispell-parsing-keyword
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3815 (if (search-backward ispell-parsing-keyword nil t)
111433
05dc9dca8729 Replace end-of-line, save-excursion etc with point-at-eol, point-at-bol.
Glenn Morris <rgm@gnu.org>
parents: 111336
diff changeset
3816 (let ((end (point-at-eol))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3817 string)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3818 (search-forward ispell-parsing-keyword)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3819 (while (re-search-forward " *\\([^ \"]+\\)" end t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3820 ;; space separated definitions.
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
3821 (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
3822 (cond ((and (string-match "latex-mode" string)
04e6bb1f69e1 (ispell-local-dictionary-alist): New variable for
Karl Heuer <kwzh@gnu.org>
parents: 24468
diff changeset
3823 (not (eq 'exclusive ispell-check-comments)))
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3824 (ispell-send-string "+\n~tex\n"))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3825 ((string-match "nroff-mode" string)
28563
7d8ea470609b (ispell-menu-map): Menu items rearranged and
Eli Zaretskii <eliz@gnu.org>
parents: 27260
diff changeset
3826 (ispell-send-string "-\n~nroff\n"))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3827 ((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
3828 (ispell-send-string (concat string "\n")))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3829 (t (message "Invalid Ispell Parsing argument!")
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3830 (sit-for 2))))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3831
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3832
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3833 ;; Can kill the current ispell process
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3834
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
3835 (defun ispell-buffer-local-dict (&optional no-reload)
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3836 "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
3837 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
3838 When a dictionary is defined in the buffer (see variable
7607
0a3110658ada Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 7606
diff changeset
3839 `ispell-dictionary-keyword'), it will override the local setting
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3840 from \\[ispell-change-dictionary].
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3841 Both should not be used to define a buffer-local dictionary."
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3842 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3843 (goto-char (point-min))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3844 (let (end)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3845 ;; Override the local variable definition.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3846 ;; Uses last occurrence of ispell-dictionary-keyword.
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3847 (goto-char (point-max))
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3848 (unless ispell-local-dictionary-overridden
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3849 (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
3850 (progn
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3851 (search-forward ispell-dictionary-keyword)
111433
05dc9dca8729 Replace end-of-line, save-excursion etc with point-at-eol, point-at-bol.
Glenn Morris <rgm@gnu.org>
parents: 111336
diff changeset
3852 (setq end (point-at-eol))
59822
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3853 (if (re-search-forward " *\\([^ \"]+\\)" end t)
280d6b93af80 (ispell-local-dictionary-overridden): New var.
Richard M. Stallman <rms@gnu.org>
parents: 59723
diff changeset
3854 (setq ispell-local-dictionary
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
3855 (match-string-no-properties 1))))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3856 (goto-char (point-max))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3857 (if (search-backward ispell-pdict-keyword nil t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3858 (progn
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3859 (search-forward ispell-pdict-keyword)
111433
05dc9dca8729 Replace end-of-line, save-excursion etc with point-at-eol, point-at-bol.
Glenn Morris <rgm@gnu.org>
parents: 111336
diff changeset
3860 (setq end (point-at-eol))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3861 (if (re-search-forward " *\\([^ \"]+\\)" end t)
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3862 (setq ispell-local-pdict
63139
be61de52f953 (ispell-check-version): Use match-string-no-properties.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
3863 (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
3864 (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
3865 ;; 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
3866 (ispell-internal-change-dictionary)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3867
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3868
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3869 (defun ispell-buffer-local-words ()
100992
5cb6d276b93a * textmodes/ispell.el (ispell-check-minver, ispell-last-program-name)
Juanma Barranquero <lekktu@gmail.com>
parents: 100987
diff changeset
3870 "Load 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
3871 ;; 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
3872 ;; kill it.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3873 (if (and ispell-buffer-local-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3874 (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
3875 (ispell-kill-ispell t))
9a94da622aa0 (ispell-current-personal-dictionary): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 67427
diff changeset
3876 ;; 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
3877 ;; to send commands now to specify the local words to it.
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3878 (ispell-init-process)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3879 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3880 (goto-char (point-min))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3881 (while (search-forward ispell-words-keyword nil t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3882 (or ispell-buffer-local-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3883 (setq ispell-buffer-local-name (buffer-name)))
111433
05dc9dca8729 Replace end-of-line, save-excursion etc with point-at-eol, point-at-bol.
Glenn Morris <rgm@gnu.org>
parents: 111336
diff changeset
3884 (let ((end (point-at-eol))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3885 (ispell-casechars (ispell-get-casechars))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3886 string)
10136
37fa43bb8056 Added ispell-offset for version consistency.
Karl Heuer <kwzh@gnu.org>
parents: 9718
diff changeset
3887 ;; 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
3888 ;; 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
3889 (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
3890 (setq string (match-string-no-properties 1))
80046
204931554291 *** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents: 79719
diff changeset
3891 ;; This can fail when string contains a word with invalid chars.
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3892 ;; Error handling needs to be added between ispell and Emacs.
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3893 (if (and (< 1 (length string))
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3894 (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
3895 (ispell-send-string (concat "@" string "\n"))))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3896
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3897
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3898 ;;; returns optionally adjusted region-end-point.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3899
111297
7f671f436f9d * lisp/textmodes/ispell.el (comment-add): Declare.
Glenn Morris <rgm@gnu.org>
parents: 111023
diff changeset
3900 ;; If comment-padright is defined, newcomment must be loaded.
7f671f436f9d * lisp/textmodes/ispell.el (comment-add): Declare.
Glenn Morris <rgm@gnu.org>
parents: 111023
diff changeset
3901 (declare-function comment-add "newcomment" (arg))
7f671f436f9d * lisp/textmodes/ispell.el (comment-add): Declare.
Glenn Morris <rgm@gnu.org>
parents: 111023
diff changeset
3902
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3903 (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
3904 "Add WORD to the per-file word list."
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3905 (or ispell-buffer-local-name
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3906 (setq ispell-buffer-local-name (buffer-name)))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3907 (save-excursion
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3908 (goto-char (point-min))
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3909 (let (line-okay search done found)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3910 (while (not done)
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3911 (let ((case-fold-search nil))
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3912 (setq 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
3913 found (or found search)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3914 line-okay (< (+ (length word) 1 ; 1 for space after word..
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3915 (progn (end-of-line) (current-column)))
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3916 fill-column)))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3917 (if (or (and search line-okay)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3918 (null search))
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3919 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3920 (setq done t)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3921 (if (null search)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3922 (progn
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3923 (open-line 1)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3924 (unless found (newline))
110443
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3925 (insert (if (fboundp 'comment-padright)
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3926 ;; Try and use the proper comment marker,
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3927 ;; e.g. ";;" rather than ";".
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3928 (comment-padright comment-start
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3929 (comment-add nil))
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3930 comment-start)
f6272822d94c * lisp/textmodes/ispell.el: Fix commenting convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110301
diff changeset
3931 " " ispell-words-keyword)
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3932 (if (> (length comment-end) 0)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3933 (save-excursion
30929
3d5ccbaddc59 Set to standard author/maintainer/keyword fields.
Gerd Moellmann <gerd@gnu.org>
parents: 30803
diff changeset
3934 (newline)
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3935 (insert comment-end)))))
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3936 (insert (concat " " word))))))))
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3937
29078
2e20146198ce Add to debug-ignored-errors.
Dave Love <fx@gnu.org>
parents: 28616
diff changeset
3938 (add-to-list 'debug-ignored-errors "^No word found to check!$")
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3939
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3940 (provide 'ispell)
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3941
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3942
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3943 ;;; LOCAL VARIABLES AND BUFFER-LOCAL VALUE EXAMPLES.
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3944
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3945 ;; Local Variable options:
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3946 ;; mode: name(-mode)
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3947 ;; eval: expression
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3948 ;; local-variable: value
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3949
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3950 ;; The following sets the buffer local dictionary to `american' English
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3951 ;; and spell checks only comments.
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3952
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3953 ;; Local Variables:
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3954 ;; mode: emacs-lisp
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3955 ;; comment-column: 40
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3956 ;; ispell-check-comments: exclusive
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3957 ;; ispell-local-dictionary: "american"
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3958 ;; End:
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3959
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3960
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3961 ;;; MORE EXAMPLES OF ISPELL BUFFER-LOCAL VALUES
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3962
94327
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3963 ;; The following places this file in nroff parsing and extended char modes.
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3964 ;; Local IspellParsing: nroff-mode ~nroff
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3965 ;; Change IspellPersDict to IspellPersDict: to enable the following line.
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3966 ;; Local IspellPersDict ~/.ispell_lisp
ff97f6b52868 (ispell-dictionary-alist-1)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94303
diff changeset
3967 ;; 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
3968 ; 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
3969 ; 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
3970 ; 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
3971 ; 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
3972 ; 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
3973 ; 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
3974 ; 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
3975 ; LocalWords: lns XEmacs HTML casechars Multibyte
6138
1642e3f231d0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3976
21873
3ab8be88f2ef Generalized region skipping added.
Richard M. Stallman <rms@gnu.org>
parents: 21592
diff changeset
3977 ;;; ispell.el ends here