annotate lisp/textmodes/ispell.el @ 26177:947ea67eae70

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