Mercurial > emacs
annotate lisp/textmodes/flyspell.el @ 54736:b94de166de9d
(ethio-sera-being-called-by-w3): New
variable.
(ethio-sera-to-fidel-ethio): Check ethio-sera-being-called-by-w3
instead of sera-being-called-by-w3.
(ethio-fidel-to-sera-buffer): Likewise.
(ethio-find-file): Bind ethio-sera-being-called-by-w3 to t
instead of sera-being-called-by-w3.
(ethio-write-file): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 05 Apr 2004 23:27:37 +0000 |
| parents | 79093b308520 |
| children | 2f1fd122c9fe |
| rev | line source |
|---|---|
|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Jan?k <Pavel@Janik.cz>
parents:
37008
diff
changeset
|
1 ;;; flyspell.el --- on-the-fly spell checker |
| 22611 | 2 |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
3 ;; Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc. |
| 22611 | 4 |
| 5 ;; Author: Manuel Serrano <Manuel.Serrano@unice.fr> | |
|
22612
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
6 ;; Keywords: convenience |
| 22611 | 7 |
|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Jan?k <Pavel@Janik.cz>
parents:
37008
diff
changeset
|
8 ;; This file is part of GNU Emacs. |
| 22611 | 9 |
| 10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 11 ;; it under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 ;; GNU General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
| 22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 23 ;; Boston, MA 02111-1307, USA. | |
| 24 | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
25 ;;; Commentary: |
| 22611 | 26 ;; |
| 27 ;; Flyspell is a minor Emacs mode performing on-the-fly spelling | |
|
22612
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
28 ;; checking. |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
29 ;; |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
30 ;; To enable Flyspell minor mode, type M-x flyspell-mode. |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
31 ;; This applies only to the current buffer. |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
32 ;; |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
33 ;; To enable Flyspell in text representing computer programs, type |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
34 ;; M-x flyspell-prog-mode. |
|
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
35 ;; In that mode only text inside comments is checked. |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
36 ;; |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
37 ;; Note: consider setting the variable ispell-parser to `tex' to |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
38 ;; avoid TeX command checking; use `(setq ispell-parser 'tex)'. |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
39 ;; |
| 22611 | 40 ;; Some user variables control the behavior of flyspell. They are |
| 41 ;; those defined under the `User variables' comment. | |
| 42 | |
| 43 ;;; Code: | |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
44 |
| 22611 | 45 (require 'ispell) |
| 46 | |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
47 ;*---------------------------------------------------------------------*/ |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
48 ;* Group ... */ |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
49 ;*---------------------------------------------------------------------*/ |
| 22611 | 50 (defgroup flyspell nil |
| 37008 | 51 "Spell checking on the fly." |
| 22611 | 52 :tag "FlySpell" |
| 53 :prefix "flyspell-" | |
|
43383
d21a74d23497
2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
43148
diff
changeset
|
54 :group 'ispell |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
55 :group 'processes) |
| 22611 | 56 |
| 57 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
58 ;* User configuration ... */ |
| 22611 | 59 ;*---------------------------------------------------------------------*/ |
| 60 (defcustom flyspell-highlight-flag t | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
61 "*How Flyspell should indicate misspelled words. |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
62 Non-nil means use highlight, nil means use minibuffer messages." |
| 22611 | 63 :group 'flyspell |
| 64 :type 'boolean) | |
| 65 | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
66 (defcustom flyspell-mark-duplications-flag t |
|
22962
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
67 "*Non-nil means Flyspell reports a repeated word as an error." |
| 22611 | 68 :group 'flyspell |
| 69 :type 'boolean) | |
| 70 | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
71 (defcustom flyspell-sort-corrections nil |
| 22611 | 72 "*Non-nil means, sort the corrections alphabetically before popping them." |
| 73 :group 'flyspell | |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
74 :version "21.1" |
| 22611 | 75 :type 'boolean) |
| 76 | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
77 (defcustom flyspell-duplicate-distance -1 |
|
22962
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
78 "*The maximum distance for finding duplicates of unrecognized words. |
|
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
79 This applies to the feature that when a word is not found in the dictionary, |
|
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
80 if the same spelling occurs elsewhere in the buffer, |
|
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
81 Flyspell uses a different face (`flyspell-duplicate-face') to highlight it. |
|
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
82 This variable specifies how far to search to find such a duplicate. |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
83 -1 means no limit (search the whole buffer). |
|
22962
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
84 0 means do not search for duplicate unrecognized spellings." |
| 22611 | 85 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
86 :version "21.1" |
| 22611 | 87 :type 'number) |
| 88 | |
| 89 (defcustom flyspell-delay 3 | |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
90 "*The number of seconds to wait before checking, after a \"delayed\" command." |
| 22611 | 91 :group 'flyspell |
| 92 :type 'number) | |
| 93 | |
| 94 (defcustom flyspell-persistent-highlight t | |
|
22946
cfde96067373
(flyspell-persistent-highlight): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
22891
diff
changeset
|
95 "*Non-nil means misspelled words remain highlighted until corrected. |
|
cfde96067373
(flyspell-persistent-highlight): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
22891
diff
changeset
|
96 If this variable is nil, only the most recently detected misspelled word |
|
cfde96067373
(flyspell-persistent-highlight): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
22891
diff
changeset
|
97 is highlighted." |
| 22611 | 98 :group 'flyspell |
| 99 :type 'boolean) | |
| 100 | |
| 101 (defcustom flyspell-highlight-properties t | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
102 "*Non-nil means highlight incorrect words even if a property exists for this word." |
| 22611 | 103 :group 'flyspell |
| 104 :type 'boolean) | |
| 105 | |
| 106 (defcustom flyspell-default-delayed-commands | |
| 107 '(self-insert-command | |
| 108 delete-backward-char | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
109 backward-or-forward-delete-char |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
110 delete-char |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
111 scrollbar-vertical-drag) |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
112 "The standard list of delayed commands for Flyspell. |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
113 See `flyspell-delayed-commands'." |
| 22611 | 114 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
115 :version "21.1" |
| 22611 | 116 :type '(repeat (symbol))) |
| 117 | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
118 (defcustom flyspell-delayed-commands nil |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
119 "List of commands that are \"delayed\" for Flyspell mode. |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
120 After these commands, Flyspell checking is delayed for a short time, |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
121 whose length is specified by `flyspell-delay'." |
| 22611 | 122 :group 'flyspell |
| 123 :type '(repeat (symbol))) | |
| 124 | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
125 (defcustom flyspell-default-deplacement-commands |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
126 '(next-line |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
127 previous-line |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
128 scroll-up |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
129 scroll-down) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
130 "The standard list of deplacement commands for Flyspell. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
131 See `flyspell-deplacement-commands'." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
132 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
133 :version "21.1" |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
134 :type '(repeat (symbol))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
135 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
136 (defcustom flyspell-deplacement-commands nil |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
137 "List of commands that are \"deplacement\" for Flyspell mode. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
138 After these commands, Flyspell checking is performed only if the previous |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
139 command was not the very same command." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
140 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
141 :version "21.1" |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
142 :type '(repeat (symbol))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
143 |
| 22611 | 144 (defcustom flyspell-issue-welcome-flag t |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
145 "*Non-nil means that Flyspell should display a welcome message when started." |
| 22611 | 146 :group 'flyspell |
| 147 :type 'boolean) | |
| 148 | |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
149 (defcustom flyspell-issue-message-flag t |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
150 "*Non-nil means that Flyspell emits messages when checking words." |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
151 :group 'flyspell |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
152 :type 'boolean) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
153 |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
154 (defcustom flyspell-incorrect-hook nil |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
155 "*List of functions to be called when incorrect words are encountered. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
156 Each function is given three arguments: the beginning and the end |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
157 of the incorrect region. The third is either the symbol 'doublon' or the list |
| 37008 | 158 of possible corrections as returned by 'ispell-parse-output'. |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
159 |
| 37008 | 160 If any of the functions return non-Nil, the word is not highlighted as |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
161 incorrect." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
162 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
163 :version "21.1" |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
164 :type 'hook) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
165 |
|
40933
29830f44be6a
(flyspell-default-dictionary): Allow nil as value, and make nil the default.
Richard M. Stallman <rms@gnu.org>
parents:
40898
diff
changeset
|
166 (defcustom flyspell-default-dictionary nil |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
167 "A string that is the name of the default dictionary. |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
168 This is passed to the `ispell-change-dictionary' when flyspell is started. |
|
40933
29830f44be6a
(flyspell-default-dictionary): Allow nil as value, and make nil the default.
Richard M. Stallman <rms@gnu.org>
parents:
40898
diff
changeset
|
169 If the variable `ispell-local-dictionary' or `ispell-dictionary' is non-nil |
|
29830f44be6a
(flyspell-default-dictionary): Allow nil as value, and make nil the default.
Richard M. Stallman <rms@gnu.org>
parents:
40898
diff
changeset
|
170 when flyspell is started, the value of that variable is used instead |
|
29830f44be6a
(flyspell-default-dictionary): Allow nil as value, and make nil the default.
Richard M. Stallman <rms@gnu.org>
parents:
40898
diff
changeset
|
171 of `flyspell-default-dictionary' to select the default dictionary. |
|
29830f44be6a
(flyspell-default-dictionary): Allow nil as value, and make nil the default.
Richard M. Stallman <rms@gnu.org>
parents:
40898
diff
changeset
|
172 Otherwise, if `flyspell-default-dictionary' is nil, it means to use |
|
29830f44be6a
(flyspell-default-dictionary): Allow nil as value, and make nil the default.
Richard M. Stallman <rms@gnu.org>
parents:
40898
diff
changeset
|
173 Ispell's ultimate default dictionary." |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
174 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
175 :version "21.1" |
|
40942
52f0b9d1d57b
(flyspell-default-dictionary): Fix previous change.
Pavel Jan?k <Pavel@Janik.cz>
parents:
40938
diff
changeset
|
176 :type '(choice string (const :tag "Default" nil))) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
177 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
178 (defcustom flyspell-tex-command-regexp |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
179 "\\(\\(begin\\|end\\)[ \t]*{\\|\\(cite[a-z*]*\\|label\\|ref\\|eqref\\|usepackage\\|documentclass\\)[ \t]*\\(\\[[^]]*\\]\\)?{[^{}]*\\)" |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
180 "A string that is the regular expression that matches TeX commands." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
181 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
182 :version "21.1" |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
183 :type 'string) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
184 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
185 (defcustom flyspell-check-tex-math-command nil |
| 37008 | 186 "*Non nil means check even inside TeX math environment. |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
187 TeX math environments are discovered by the TEXMATHP that implemented |
|
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
188 inside the texmathp.el Emacs package. That package may be found at: |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
189 http://strw.leidenuniv.nl/~dominik/Tools" |
| 22611 | 190 :group 'flyspell |
| 191 :type 'boolean) | |
| 192 | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
193 (defcustom flyspell-dictionaries-that-consider-dash-as-word-delimiter |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
194 '("francais" "deutsch8" "norsk") |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
195 "List of dictionary names that consider `-' as word delimiter." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
196 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
197 :version "21.1" |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
198 :type '(repeat (string))) |
| 22611 | 199 |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
200 (defcustom flyspell-abbrev-p |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
201 t |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
202 "*If true, add correction to abbreviation table." |
| 22611 | 203 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
204 :version "21.1" |
| 22611 | 205 :type 'boolean) |
| 206 | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
207 (defcustom flyspell-use-global-abbrev-table-p |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
208 nil |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
209 "*If true, prefer global abbrev table to local abbrev table." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
210 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
211 :version "21.1" |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
212 :type 'boolean) |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
213 |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
214 ;;;###autoload |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
215 (defcustom flyspell-mode-line-string " Fly" |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
216 "*String displayed on the modeline when flyspell is active. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
217 Set this to nil if you don't want a modeline indicator." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
218 :group 'flyspell |
|
42622
2c67c90f9b6d
(flyspell-mode-line-string): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
42456
diff
changeset
|
219 :type '(choice string (const :tag "None" nil))) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
220 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
221 (defcustom flyspell-large-region 1000 |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
222 "*The threshold that determines if a region is small. |
|
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
223 The `flyspell-region' function is invoked if the region is small, the |
|
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
224 word are checked one after the other using regular flyspell check |
|
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
225 means. If the region is large, a new Ispell process is spawned to get |
|
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
226 speed." |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
227 :group 'flyspell |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
228 :version "21.1" |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
229 :type 'number) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
230 |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
231 (defcustom flyspell-insert-function (function insert) |
|
43148
b3cf1a561428
(flyspell-insert-function): Doc fix.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43064
diff
changeset
|
232 "*Function for inserting word by flyspell upon correction." |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
233 :group 'flyspell |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
234 :type 'function) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
235 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
236 (defcustom flyspell-before-incorrect-word-string nil |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
237 "String used to indicate an incorrect word starting." |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
238 :group 'flyspell |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
239 :type '(choice string (const nil))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
240 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
241 (defcustom flyspell-after-incorrect-word-string nil |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
242 "String used to indicate an incorrect word ending." |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
243 :group 'flyspell |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
244 :type '(choice string (const nil))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
245 |
| 22611 | 246 ;*---------------------------------------------------------------------*/ |
| 247 ;* Mode specific options */ | |
| 248 ;* ------------------------------------------------------------- */ | |
| 249 ;* Mode specific options enable users to disable flyspell on */ | |
| 250 ;* certain word depending of the emacs mode. For instance, when */ | |
| 251 ;* using flyspell with mail-mode add the following expression */ | |
| 252 ;* in your .emacs file: */ | |
| 253 ;* (add-hook 'mail-mode */ | |
| 254 ;* '(lambda () (setq flyspell-generic-check-word-p */ | |
| 255 ;* 'mail-mode-flyspell-verify))) */ | |
| 256 ;*---------------------------------------------------------------------*/ | |
| 257 (defvar flyspell-generic-check-word-p nil | |
| 258 "Function providing per-mode customization over which words are flyspelled. | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
259 Returns t to continue checking, nil otherwise. |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
260 Flyspell mode sets this variable to whatever is the `flyspell-mode-predicate' |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
261 property of the major mode name.") |
| 22611 | 262 (make-variable-buffer-local 'flyspell-generic-check-word-p) |
| 263 | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
264 ;*--- mail mode -------------------------------------------------------*/ |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
265 (put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify) |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
266 (put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify) |
| 22611 | 267 (defun mail-mode-flyspell-verify () |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
268 "This function is used for `flyspell-generic-check-word-p' in Mail mode." |
|
34925
6043184119bc
(mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents:
33787
diff
changeset
|
269 (let ((in-headers (save-excursion |
|
53420
95e0a0bdebb2
(mail-mode-flyspell-verify): Search for header separator alone on a
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
270 ;; When mail-header-separator is "", |
|
95e0a0bdebb2
(mail-mode-flyspell-verify): Search for header separator alone on a
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
271 ;; it is likely to be found in both directions. |
|
95e0a0bdebb2
(mail-mode-flyspell-verify): Search for header separator alone on a
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
272 (not (re-search-backward (concat "^" (regexp-quote mail-header-separator) "$") nil t)))) |
|
34925
6043184119bc
(mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents:
33787
diff
changeset
|
273 (in-signature (save-excursion |
|
6043184119bc
(mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents:
33787
diff
changeset
|
274 (re-search-backward message-signature-separator nil t)))) |
|
6043184119bc
(mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents:
33787
diff
changeset
|
275 (cond (in-headers |
|
35338
3ee28dccba1d
(mail-mode-flyspell-verify): Check in
Gerd Moellmann <gerd@gnu.org>
parents:
34925
diff
changeset
|
276 (and (save-excursion (beginning-of-line) |
|
3ee28dccba1d
(mail-mode-flyspell-verify): Check in
Gerd Moellmann <gerd@gnu.org>
parents:
34925
diff
changeset
|
277 (looking-at "^Subject:")) |
|
3ee28dccba1d
(mail-mode-flyspell-verify): Check in
Gerd Moellmann <gerd@gnu.org>
parents:
34925
diff
changeset
|
278 (> (point) (match-end 0)))) |
|
34925
6043184119bc
(mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents:
33787
diff
changeset
|
279 (in-signature |
|
6043184119bc
(mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents:
33787
diff
changeset
|
280 nil) |
|
6043184119bc
(mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents:
33787
diff
changeset
|
281 (t |
|
6043184119bc
(mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents:
33787
diff
changeset
|
282 (save-excursion |
|
6043184119bc
(mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents:
33787
diff
changeset
|
283 (beginning-of-line) |
|
6043184119bc
(mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents:
33787
diff
changeset
|
284 (not (looking-at "[>}|]\\To:"))))))) |
| 22611 | 285 |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
286 ;*--- texinfo mode ----------------------------------------------------*/ |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
287 (put 'texinfo-mode 'flyspell-mode-predicate 'texinfo-mode-flyspell-verify) |
| 22611 | 288 (defun texinfo-mode-flyspell-verify () |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
289 "This function is used for `flyspell-generic-check-word-p' in Texinfo mode." |
| 22611 | 290 (save-excursion |
| 291 (forward-word -1) | |
| 292 (not (looking-at "@")))) | |
| 293 | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
294 ;*--- tex mode --------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
295 (put 'tex-mode 'flyspell-mode-predicate 'tex-mode-flyspell-verify) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
296 (defun tex-mode-flyspell-verify () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
297 "This function is used for `flyspell-generic-check-word-p' in LaTeX mode." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
298 (and |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
299 (not (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
300 (re-search-backward "^[ \t]*%%%[ \t]+Local" (point-min) t))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
301 (not (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
302 (let ((this (point-marker)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
303 (e (progn (end-of-line) (point-marker)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
304 (beginning-of-line) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
305 (if (re-search-forward "\\\\\\(cite\\|label\\|ref\\){[^}]*}" e t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
306 (and (>= this (match-beginning 0)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
307 (<= this (match-end 0)) ))))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
308 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
309 ;*--- sgml mode -------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
310 (put 'sgml-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
311 (put 'html-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
312 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
313 (defun sgml-mode-flyspell-verify () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
314 "This function is used for `flyspell-generic-check-word-p' in SGML mode." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
315 (not (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
316 (let ((this (point-marker)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
317 (s (progn (beginning-of-line) (point-marker))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
318 (e (progn (end-of-line) (point-marker)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
319 (or (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
320 (goto-char this) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
321 (and (re-search-forward "[^<]*>" e t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
322 (= (match-beginning 0) this))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
323 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
324 (goto-char this) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
325 (and (re-search-backward "<[^>]*" s t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
326 (= (match-end 0) this))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
327 (and (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
328 (goto-char this) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
329 (and (re-search-forward "[^&]*;" e t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
330 (= (match-beginning 0) this))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
331 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
332 (goto-char this) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
333 (and (re-search-backward "&[^;]*" s t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
334 (= (match-end 0) this))))))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
335 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
336 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
337 ;* Programming mode */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
338 ;*---------------------------------------------------------------------*/ |
|
33787
d16b29f737a7
(flyspell-prog-text-faces): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33426
diff
changeset
|
339 (defvar flyspell-prog-text-faces |
|
d16b29f737a7
(flyspell-prog-text-faces): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33426
diff
changeset
|
340 '(font-lock-string-face font-lock-comment-face font-lock-doc-face) |
|
d16b29f737a7
(flyspell-prog-text-faces): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33426
diff
changeset
|
341 "Faces corresponding to text in programming-mode buffers.") |
|
d16b29f737a7
(flyspell-prog-text-faces): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33426
diff
changeset
|
342 |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
343 (defun flyspell-generic-progmode-verify () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
344 "Used for `flyspell-generic-check-word-p' in programming modes." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
345 (let ((f (get-text-property (point) 'face))) |
|
33787
d16b29f737a7
(flyspell-prog-text-faces): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33426
diff
changeset
|
346 (memq f flyspell-prog-text-faces))) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
347 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
348 ;;;###autoload |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
349 (defun flyspell-prog-mode () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
350 "Turn on `flyspell-mode' for comments and strings." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
351 (interactive) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
352 (setq flyspell-generic-check-word-p 'flyspell-generic-progmode-verify) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
353 (flyspell-mode 1)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
354 |
| 22611 | 355 ;*---------------------------------------------------------------------*/ |
| 356 ;* Overlay compatibility */ | |
| 357 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
358 (autoload 'make-overlay "overlay" "Overlay compatibility kit." t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
359 (autoload 'overlayp "overlay" "Overlay compatibility kit." t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
360 (autoload 'overlays-in "overlay" "Overlay compatibility kit." t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
361 (autoload 'delete-overlay "overlay" "Overlay compatibility kit." t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
362 (autoload 'overlays-at "overlay" "Overlay compatibility kit." t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
363 (autoload 'overlay-put "overlay" "Overlay compatibility kit." t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
364 (autoload 'overlay-get "overlay" "Overlay compatibility kit." t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
365 (autoload 'previous-overlay-change "overlay" "Overlay compatibility kit." t) |
| 22611 | 366 |
| 367 ;*---------------------------------------------------------------------*/ | |
| 368 ;* Which emacs are we currently running */ | |
| 369 ;*---------------------------------------------------------------------*/ | |
| 370 (defvar flyspell-emacs | |
| 371 (cond | |
| 372 ((string-match "XEmacs" emacs-version) | |
| 373 'xemacs) | |
| 374 (t | |
| 375 'emacs)) | |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
376 "The type of Emacs we are currently running.") |
| 22611 | 377 |
|
23943
7555c77bc4f0
If local-maps work, don't put
Richard M. Stallman <rms@gnu.org>
parents:
23788
diff
changeset
|
378 (defvar flyspell-use-local-map |
|
7555c77bc4f0
If local-maps work, don't put
Richard M. Stallman <rms@gnu.org>
parents:
23788
diff
changeset
|
379 (or (eq flyspell-emacs 'xemacs) |
|
7555c77bc4f0
If local-maps work, don't put
Richard M. Stallman <rms@gnu.org>
parents:
23788
diff
changeset
|
380 (not (string< emacs-version "20")))) |
|
7555c77bc4f0
If local-maps work, don't put
Richard M. Stallman <rms@gnu.org>
parents:
23788
diff
changeset
|
381 |
| 22611 | 382 ;*---------------------------------------------------------------------*/ |
| 383 ;* The minor mode declaration. */ | |
| 384 ;*---------------------------------------------------------------------*/ | |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
385 (eval-when-compile (defvar flyspell-local-mouse-map)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
386 |
|
43444
e3bdc12b3e47
(flyspell-mode): Autoload the variable since it is used in the menu bar.
Sam Steingold <sds@gnu.org>
parents:
43383
diff
changeset
|
387 ;;;###autoload |
| 22611 | 388 (defvar flyspell-mode nil) |
| 389 (make-variable-buffer-local 'flyspell-mode) | |
| 390 | |
|
27787
d40d47971e6b
(flyspell-mouse-map): Change definition
Dave Love <fx@gnu.org>
parents:
24943
diff
changeset
|
391 (defvar flyspell-mouse-map |
|
d40d47971e6b
(flyspell-mouse-map): Change definition
Dave Love <fx@gnu.org>
parents:
24943
diff
changeset
|
392 (let ((map (make-sparse-keymap))) |
|
d40d47971e6b
(flyspell-mouse-map): Change definition
Dave Love <fx@gnu.org>
parents:
24943
diff
changeset
|
393 (cond |
|
d40d47971e6b
(flyspell-mouse-map): Change definition
Dave Love <fx@gnu.org>
parents:
24943
diff
changeset
|
394 ((eq flyspell-emacs 'xemacs) |
|
40898
a69946fb84de
(flyspell-correct-word/local-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
40858
diff
changeset
|
395 (define-key map [(button2)] #'flyspell-correct-word) |
|
30470
6f18c5924d2e
(flyspell-mouse-map): Use `map' instead
Gerd Moellmann <gerd@gnu.org>
parents:
30428
diff
changeset
|
396 (define-key map "\M-\t" #'flyspell-auto-correct-word)) |
|
27787
d40d47971e6b
(flyspell-mouse-map): Change definition
Dave Love <fx@gnu.org>
parents:
24943
diff
changeset
|
397 (flyspell-use-local-map |
|
40898
a69946fb84de
(flyspell-correct-word/local-keymap): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
40858
diff
changeset
|
398 (define-key map [(mouse-2)] #'flyspell-correct-word) |
|
27787
d40d47971e6b
(flyspell-mouse-map): Change definition
Dave Love <fx@gnu.org>
parents:
24943
diff
changeset
|
399 (define-key map "\M-\t" #'flyspell-auto-correct-word))) |
|
d40d47971e6b
(flyspell-mouse-map): Change definition
Dave Love <fx@gnu.org>
parents:
24943
diff
changeset
|
400 map)) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
401 |
|
42346
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
402 ;;;###autoload |
|
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
403 (defvar flyspell-mode-map (make-sparse-keymap)) |
|
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
404 |
|
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
405 ;; mouse, keyboard bindings and misc definition |
|
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
406 (when (or (assoc 'flyspell-mode minor-mode-map-alist) |
|
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
407 (setq minor-mode-map-alist |
|
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
408 (cons (cons 'flyspell-mode flyspell-mode-map) |
|
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
409 minor-mode-map-alist))) |
|
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
410 (define-key flyspell-mode-map "\M-\t" 'flyspell-auto-correct-word)) |
|
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
411 |
| 22611 | 412 ;; the name of the overlay property that defines the keymap |
|
40858
0517a2e0f908
Use the keymap property instead of local-map, and don't use a minor-mode map.
Richard M. Stallman <rms@gnu.org>
parents:
38436
diff
changeset
|
413 (defvar flyspell-overlay-keymap-property-name 'keymap) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
414 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
415 ;; dash character machinery |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
416 (defvar flyspell-consider-dash-as-word-delimiter-flag nil |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
417 "*Non-nil means that the `-' char is considered as a word delimiter.") |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
418 (make-variable-buffer-local 'flyspell-consider-dash-as-word-delimiter-flag) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
419 (defvar flyspell-dash-dictionary nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
420 (make-variable-buffer-local 'flyspell-dash-dictionary) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
421 (defvar flyspell-dash-local-dictionary nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
422 (make-variable-buffer-local 'flyspell-dash-local-dictionary) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
423 |
| 22611 | 424 ;*---------------------------------------------------------------------*/ |
| 425 ;* Highlighting */ | |
| 426 ;*---------------------------------------------------------------------*/ | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
427 (defface flyspell-incorrect-face |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
428 (if (eq flyspell-emacs 'xemacs) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
429 '((((class color)) (:foreground "OrangeRed" :bold t :underline t)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
430 (t (:bold t))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
431 '((((class color)) (:foreground "OrangeRed" :weight bold :underline t)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
432 (t (:weight bold)))) |
|
22962
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
433 "Face used for marking a misspelled word in Flyspell." |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
434 :group 'flyspell) |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
435 |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
436 (defface flyspell-duplicate-face |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
437 (if (eq flyspell-emacs 'xemacs) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
438 '((((class color)) (:foreground "Gold3" :bold t :underline t)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
439 (t (:bold t))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
440 '((((class color)) (:foreground "Gold3" :weight bold :underline t)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
441 (t (:weight bold)))) |
|
22962
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
442 "Face used for marking a misspelled word that appears twice in the buffer. |
|
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
443 See also `flyspell-duplicate-distance'." |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
444 :group 'flyspell) |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
445 |
| 22611 | 446 (defvar flyspell-overlay nil) |
| 447 | |
| 448 ;*---------------------------------------------------------------------*/ | |
| 449 ;* flyspell-mode ... */ | |
| 450 ;*---------------------------------------------------------------------*/ | |
| 451 ;;;###autoload | |
| 452 (defun flyspell-mode (&optional arg) | |
| 453 "Minor mode performing on-the-fly spelling checking. | |
| 454 Ispell is automatically spawned on background for each entered words. | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
455 The default flyspell behavior is to highlight incorrect words. |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
456 With no argument, this command toggles Flyspell mode. |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
457 With a prefix argument ARG, turn Flyspell minor mode on iff ARG is positive. |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
458 |
| 22611 | 459 Bindings: |
| 460 \\[ispell-word]: correct words (using Ispell). | |
| 461 \\[flyspell-auto-correct-word]: automatically correct word. | |
| 462 \\[flyspell-correct-word] (or mouse-2): popup correct words. | |
| 463 | |
| 464 Hooks: | |
|
40858
0517a2e0f908
Use the keymap property instead of local-map, and don't use a minor-mode map.
Richard M. Stallman <rms@gnu.org>
parents:
38436
diff
changeset
|
465 This runs `flyspell-mode-hook' after flyspell is entered. |
| 22611 | 466 |
| 467 Remark: | |
| 468 `flyspell-mode' uses `ispell-mode'. Thus all Ispell options are | |
| 469 valid. For instance, a personal dictionary can be used by | |
| 470 invoking `ispell-change-dictionary'. | |
| 471 | |
| 472 Consider using the `ispell-parser' to check your text. For instance | |
| 473 consider adding: | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
474 \(add-hook 'tex-mode-hook (function (lambda () (setq ispell-parser 'tex)))) |
| 22611 | 475 in your .emacs file. |
| 476 | |
|
40858
0517a2e0f908
Use the keymap property instead of local-map, and don't use a minor-mode map.
Richard M. Stallman <rms@gnu.org>
parents:
38436
diff
changeset
|
477 \\[flyspell-region] checks all words inside a region. |
|
0517a2e0f908
Use the keymap property instead of local-map, and don't use a minor-mode map.
Richard M. Stallman <rms@gnu.org>
parents:
38436
diff
changeset
|
478 \\[flyspell-buffer] checks the whole buffer." |
| 22611 | 479 (interactive "P") |
|
23179
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
480 (let ((old-flyspell-mode flyspell-mode)) |
|
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
481 ;; Mark the mode as on or off. |
|
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
482 (setq flyspell-mode (not (or (and (null arg) flyspell-mode) |
|
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
483 (<= (prefix-numeric-value arg) 0)))) |
|
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
484 ;; Do the real work. |
|
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
485 (unless (eq flyspell-mode old-flyspell-mode) |
|
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
486 (if flyspell-mode |
|
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
487 (flyspell-mode-on) |
|
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
488 (flyspell-mode-off)) |
|
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
489 ;; Force modeline redisplay. |
|
72461ea3cfc8
(flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents:
22963
diff
changeset
|
490 (set-buffer-modified-p (buffer-modified-p))))) |
| 22611 | 491 |
| 492 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
493 ;* Autoloading */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
494 ;*---------------------------------------------------------------------*/ |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
495 ;;;###autoload |
|
40858
0517a2e0f908
Use the keymap property instead of local-map, and don't use a minor-mode map.
Richard M. Stallman <rms@gnu.org>
parents:
38436
diff
changeset
|
496 (add-minor-mode 'flyspell-mode |
|
0517a2e0f908
Use the keymap property instead of local-map, and don't use a minor-mode map.
Richard M. Stallman <rms@gnu.org>
parents:
38436
diff
changeset
|
497 'flyspell-mode-line-string |
|
42346
76e044b68878
(flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents:
40942
diff
changeset
|
498 flyspell-mode-map |
|
40858
0517a2e0f908
Use the keymap property instead of local-map, and don't use a minor-mode map.
Richard M. Stallman <rms@gnu.org>
parents:
38436
diff
changeset
|
499 nil |
|
0517a2e0f908
Use the keymap property instead of local-map, and don't use a minor-mode map.
Richard M. Stallman <rms@gnu.org>
parents:
38436
diff
changeset
|
500 'flyspell-mode) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
501 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
502 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
503 ;* flyspell-buffers ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
504 ;* ------------------------------------------------------------- */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
505 ;* For remembering buffers running flyspell */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
506 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
507 (defvar flyspell-buffers nil) |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
508 |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
509 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
510 ;* flyspell-minibuffer-p ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
511 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
512 (defun flyspell-minibuffer-p (buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
513 "Is BUFFER a minibuffer?" |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
514 (let ((ws (get-buffer-window-list buffer t))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
515 (and (consp ws) (window-minibuffer-p (car ws))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
516 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
517 ;*---------------------------------------------------------------------*/ |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
518 ;* flyspell-version ... */ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
519 ;*---------------------------------------------------------------------*/ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
520 ;;;###autoload |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
521 (defun flyspell-version () |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
522 "The flyspell version" |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
523 (interactive) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
524 "1.6h") |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
525 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
526 ;*---------------------------------------------------------------------*/ |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
527 ;* flyspell-accept-buffer-local-defs ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
528 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
529 (defun flyspell-accept-buffer-local-defs () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
530 (ispell-accept-buffer-local-defs) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
531 (if (not (and (eq flyspell-dash-dictionary ispell-dictionary) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
532 (eq flyspell-dash-local-dictionary ispell-local-dictionary))) |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
533 ;; the dictionary has changed |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
534 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
535 (setq flyspell-dash-dictionary ispell-dictionary) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
536 (setq flyspell-dash-local-dictionary ispell-local-dictionary) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
537 (if (member (or ispell-local-dictionary ispell-dictionary) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
538 flyspell-dictionaries-that-consider-dash-as-word-delimiter) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
539 (setq flyspell-consider-dash-as-word-delimiter-flag t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
540 (setq flyspell-consider-dash-as-word-delimiter-flag nil))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
541 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
542 ;*---------------------------------------------------------------------*/ |
| 22611 | 543 ;* flyspell-mode-on ... */ |
| 544 ;*---------------------------------------------------------------------*/ | |
| 545 (defun flyspell-mode-on () | |
| 23234 | 546 "Turn Flyspell mode on. Do not use this; use `flyspell-mode' instead." |
| 22611 | 547 (setq ispell-highlight-face 'flyspell-incorrect-face) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
548 ;; local dictionaries setup |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
549 (ispell-change-dictionary |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
550 (or ispell-local-dictionary ispell-dictionary flyspell-default-dictionary)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
551 ;; we have to force ispell to accept the local definition or |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
552 ;; otherwise it could be too late, the local dictionary may |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
553 ;; be forgotten! |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
554 (flyspell-accept-buffer-local-defs) |
|
45184
fe852d8d5495
(make-flyspell-overlay): Add help text to flyspell overlays.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43444
diff
changeset
|
555 ;; we put the `flyspell-delayed' property on some commands |
| 22611 | 556 (flyspell-delay-commands) |
|
45184
fe852d8d5495
(make-flyspell-overlay): Add help text to flyspell overlays.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43444
diff
changeset
|
557 ;; we put the `flyspell-deplacement' property on some commands |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
558 (flyspell-deplacement-commands) |
| 22611 | 559 ;; we bound flyspell action to post-command hook |
|
22962
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
560 (add-hook 'post-command-hook (function flyspell-post-command-hook) t t) |
| 22611 | 561 ;; we bound flyspell action to pre-command hook |
|
22962
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
562 (add-hook 'pre-command-hook (function flyspell-pre-command-hook) t t) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
563 ;; we bound flyspell action to after-change hook |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
564 (make-local-variable 'after-change-functions) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
565 (setq after-change-functions |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
566 (cons 'flyspell-after-change-function after-change-functions)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
567 ;; set flyspell-generic-check-word-p based on the major mode |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
568 (let ((mode-predicate (get major-mode 'flyspell-mode-predicate))) |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
569 (if mode-predicate |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
570 (setq flyspell-generic-check-word-p mode-predicate))) |
| 22611 | 571 ;; the welcome message |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
572 (if (and flyspell-issue-message-flag |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
573 flyspell-issue-welcome-flag |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
574 (interactive-p)) |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
575 (let ((binding (where-is-internal 'flyspell-auto-correct-word |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
576 nil 'non-ascii))) |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
577 (message |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
578 (if binding |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
579 (format "Welcome to flyspell. Use %s or Mouse-2 to correct words." |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
580 (key-description binding)) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
581 "Welcome to flyspell. Use Mouse-2 to correct words.")))) |
| 22611 | 582 ;; we end with the flyspell hooks |
| 583 (run-hooks 'flyspell-mode-hook)) | |
| 584 | |
| 585 ;*---------------------------------------------------------------------*/ | |
| 586 ;* flyspell-delay-commands ... */ | |
| 587 ;*---------------------------------------------------------------------*/ | |
| 588 (defun flyspell-delay-commands () | |
| 23234 | 589 "Install the standard set of Flyspell delayed commands." |
| 22611 | 590 (mapcar 'flyspell-delay-command flyspell-default-delayed-commands) |
| 591 (mapcar 'flyspell-delay-command flyspell-delayed-commands)) | |
| 592 | |
| 593 ;*---------------------------------------------------------------------*/ | |
| 594 ;* flyspell-delay-command ... */ | |
| 595 ;*---------------------------------------------------------------------*/ | |
| 596 (defun flyspell-delay-command (command) | |
| 23234 | 597 "Set COMMAND to be delayed, for Flyspell. |
| 22611 | 598 When flyspell `post-command-hook' is invoked because a delayed command |
| 37008 | 599 as been used the current word is not immediately checked. |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
600 It will be checked only after `flyspell-delay' seconds." |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
601 (interactive "SDelay Flyspell after Command: ") |
| 22611 | 602 (put command 'flyspell-delayed t)) |
| 603 | |
| 604 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
605 ;* flyspell-deplacement-commands ... */ |
| 22611 | 606 ;*---------------------------------------------------------------------*/ |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
607 (defun flyspell-deplacement-commands () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
608 "Install the standard set of Flyspell deplacement commands." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
609 (mapcar 'flyspell-deplacement-command flyspell-default-deplacement-commands) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
610 (mapcar 'flyspell-deplacement-command flyspell-deplacement-commands)) |
| 22611 | 611 |
| 612 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
613 ;* flyspell-deplacement-command ... */ |
| 22611 | 614 ;*---------------------------------------------------------------------*/ |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
615 (defun flyspell-deplacement-command (command) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
616 "Set COMMAND that implement cursor movements, for Flyspell. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
617 When flyspell `post-command-hook' is invoked because of a deplacement command |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
618 as been used the current word is checked only if the previous command was |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
619 not the very same deplacement command." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
620 (interactive "SDeplacement Flyspell after Command: ") |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
621 (put command 'flyspell-deplacement t)) |
| 22611 | 622 |
| 623 ;*---------------------------------------------------------------------*/ | |
| 624 ;* flyspell-word-cache ... */ | |
| 625 ;*---------------------------------------------------------------------*/ | |
| 626 (defvar flyspell-word-cache-start nil) | |
| 627 (defvar flyspell-word-cache-end nil) | |
| 628 (defvar flyspell-word-cache-word nil) | |
| 629 (make-variable-buffer-local 'flyspell-word-cache-start) | |
| 630 (make-variable-buffer-local 'flyspell-word-cache-end) | |
| 631 (make-variable-buffer-local 'flyspell-word-cache-word) | |
| 632 | |
| 633 ;*---------------------------------------------------------------------*/ | |
| 634 ;* The flyspell pre-hook, store the current position. In the */ | |
| 635 ;* post command hook, we will check, if the word at this position */ | |
| 636 ;* has to be spell checked. */ | |
| 637 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
638 (defvar flyspell-pre-buffer nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
639 (defvar flyspell-pre-point nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
640 (defvar flyspell-pre-column nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
641 (defvar flyspell-pre-pre-buffer nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
642 (defvar flyspell-pre-pre-point nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
643 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
644 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
645 ;* flyspell-previous-command ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
646 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
647 (defvar flyspell-previous-command nil |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
648 "The last interactive command checked by Flyspell.") |
| 22611 | 649 |
| 650 ;*---------------------------------------------------------------------*/ | |
| 651 ;* flyspell-pre-command-hook ... */ | |
| 652 ;*---------------------------------------------------------------------*/ | |
| 653 (defun flyspell-pre-command-hook () | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
654 "Save the current buffer and point for Flyspell's post-command hook." |
| 22611 | 655 (interactive) |
| 656 (setq flyspell-pre-buffer (current-buffer)) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
657 (setq flyspell-pre-point (point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
658 (setq flyspell-pre-column (current-column))) |
| 22611 | 659 |
| 660 ;*---------------------------------------------------------------------*/ | |
| 661 ;* flyspell-mode-off ... */ | |
| 662 ;*---------------------------------------------------------------------*/ | |
| 23234 | 663 ;;;###autoload |
| 22611 | 664 (defun flyspell-mode-off () |
| 23234 | 665 "Turn Flyspell mode off." |
| 22611 | 666 ;; we remove the hooks |
|
22962
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
667 (remove-hook 'post-command-hook (function flyspell-post-command-hook) t) |
|
f4509374e88e
(flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents:
22946
diff
changeset
|
668 (remove-hook 'pre-command-hook (function flyspell-pre-command-hook) t) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
669 (setq after-change-functions (delq 'flyspell-after-change-function |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
670 after-change-functions)) |
| 22611 | 671 ;; we remove all the flyspell hilightings |
| 672 (flyspell-delete-all-overlays) | |
| 673 ;; we have to erase pre cache variables | |
| 674 (setq flyspell-pre-buffer nil) | |
| 675 (setq flyspell-pre-point nil) | |
| 676 ;; we mark the mode as killed | |
| 677 (setq flyspell-mode nil)) | |
| 678 | |
| 679 ;*---------------------------------------------------------------------*/ | |
| 680 ;* flyspell-check-pre-word-p ... */ | |
| 681 ;*---------------------------------------------------------------------*/ | |
| 682 (defun flyspell-check-pre-word-p () | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
683 "Return non-nil if we should to check the word before point. |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
684 More precisely, it applies to the word that was before point |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
685 before the current command." |
| 22611 | 686 (cond |
| 687 ((or (not (numberp flyspell-pre-point)) | |
| 688 (not (bufferp flyspell-pre-buffer)) | |
| 689 (not (buffer-live-p flyspell-pre-buffer))) | |
| 690 nil) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
691 ((and (eq flyspell-pre-pre-point flyspell-pre-point) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
692 (eq flyspell-pre-pre-buffer flyspell-pre-buffer)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
693 nil) |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
694 ((or (and (= flyspell-pre-point (- (point) 1)) |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
695 (eq (char-syntax (char-after flyspell-pre-point)) ?w)) |
| 22611 | 696 (= flyspell-pre-point (point)) |
| 697 (= flyspell-pre-point (+ (point) 1))) | |
| 698 nil) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
699 ((and (symbolp this-command) |
|
42684
0dd547dafa5e
(flyspell-check-pre-word-p): Prevent delaying when executing keyboard
Pavel Jan?k <Pavel@Janik.cz>
parents:
42622
diff
changeset
|
700 (not executing-kbd-macro) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
701 (or (get this-command 'flyspell-delayed) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
702 (and (get this-command 'flyspell-deplacement) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
703 (eq flyspell-previous-command this-command))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
704 (or (= (current-column) 0) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
705 (= (current-column) flyspell-pre-column) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
706 (eq (char-syntax (char-after flyspell-pre-point)) ?w))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
707 nil) |
| 22611 | 708 ((not (eq (current-buffer) flyspell-pre-buffer)) |
| 709 t) | |
| 710 ((not (and (numberp flyspell-word-cache-start) | |
| 711 (numberp flyspell-word-cache-end))) | |
| 712 t) | |
| 713 (t | |
| 714 (or (< flyspell-pre-point flyspell-word-cache-start) | |
| 715 (> flyspell-pre-point flyspell-word-cache-end))))) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
716 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
717 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
718 ;* The flyspell after-change-hook, store the change position. In */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
719 ;* the post command hook, we will check, if the word at this */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
720 ;* position has to be spell checked. */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
721 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
722 (defvar flyspell-changes nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
723 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
724 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
725 ;* flyspell-after-change-function ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
726 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
727 (defun flyspell-after-change-function (start stop len) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
728 "Save the current buffer and point for Flyspell's post-command hook." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
729 (interactive) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
730 (setq flyspell-changes (cons (cons start stop) flyspell-changes))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
731 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
732 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
733 ;* flyspell-check-changed-word-p ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
734 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
735 (defun flyspell-check-changed-word-p (start stop) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
736 "Return t when the changed word has to be checked. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
737 The answer depends of several criteria. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
738 Mostly we check word delimiters." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
739 (cond |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
740 ((and (eq (char-after start) ?\n) (> stop start)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
741 t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
742 ((not (numberp flyspell-pre-point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
743 t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
744 ((and (>= flyspell-pre-point start) (<= flyspell-pre-point stop)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
745 nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
746 ((let ((pos (point))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
747 (or (>= pos start) (<= pos stop) (= pos (1+ stop)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
748 nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
749 (t |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
750 t))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
751 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
752 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
753 ;* flyspell-check-word-p ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
754 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
755 (defun flyspell-check-word-p () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
756 "Return t when the word at `point' has to be checked. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
757 The answer depends of several criteria. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
758 Mostly we check word delimiters." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
759 (cond |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
760 ((<= (- (point-max) 1) (point-min)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
761 ;; the buffer is not filled enough |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
762 nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
763 ((and (and (> (current-column) 0) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
764 (not (eq (current-column) flyspell-pre-column))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
765 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
766 (backward-char 1) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
767 (and (looking-at (flyspell-get-not-casechars)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
768 (or flyspell-consider-dash-as-word-delimiter-flag |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
769 (not (looking-at "\\-")))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
770 ;; yes because we have reached or typed a word delimiter. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
771 t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
772 ((symbolp this-command) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
773 (cond |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
774 ((get this-command 'flyspell-deplacement) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
775 (not (eq flyspell-previous-command this-command))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
776 ((get this-command 'flyspell-delayed) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
777 ;; the current command is not delayed, that |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
778 ;; is that we must check the word now |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
779 (if (fboundp 'about-xemacs) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
780 (sit-for flyspell-delay nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
781 (sit-for flyspell-delay 0 nil))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
782 (t t))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
783 (t t))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
784 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
785 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
786 ;* flyspell-debug-signal-no-check ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
787 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
788 (defun flyspell-debug-signal-no-check (msg obj) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
789 (setq debug-on-error t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
790 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
791 (let ((buffer (get-buffer-create "*flyspell-debug*"))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
792 (set-buffer buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
793 (erase-buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
794 (insert "NO-CHECK:\n") |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
795 (insert (format " %S : %S\n" msg obj))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
796 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
797 ;*---------------------------------------------------------------------*/ |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
798 ;* flyspell-debug-signal-pre-word-checked ... */ |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
799 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
800 (defun flyspell-debug-signal-pre-word-checked () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
801 (setq debug-on-error t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
802 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
803 (let ((buffer (get-buffer-create "*flyspell-debug*"))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
804 (set-buffer buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
805 (insert "PRE-WORD:\n") |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
806 (insert (format " pre-point : %S\n" flyspell-pre-point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
807 (insert (format " pre-buffer : %S\n" flyspell-pre-buffer)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
808 (insert (format " cache-start: %S\n" flyspell-word-cache-start)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
809 (insert (format " cache-end : %S\n" flyspell-word-cache-end)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
810 (goto-char (point-max))))) |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
811 |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
812 ;*---------------------------------------------------------------------*/ |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
813 ;* flyspell-debug-signal-word-checked ... */ |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
814 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
815 (defun flyspell-debug-signal-word-checked () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
816 (setq debug-on-error t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
817 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
818 (let ((oldbuf (current-buffer)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
819 (buffer (get-buffer-create "*flyspell-debug*")) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
820 (point (point))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
821 (set-buffer buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
822 (insert "WORD:\n") |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
823 (insert (format " this-cmd : %S\n" this-command)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
824 (insert (format " delayed : %S\n" (and (symbolp this-command) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
825 (get this-command 'flyspell-delayed)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
826 (insert (format " point : %S\n" point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
827 (insert (format " prev-char : [%c] %S\n" |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
828 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
829 (set-buffer oldbuf) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
830 (let ((c (if (> (point) (point-min)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
831 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
832 (backward-char 1) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
833 (char-after (point))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
834 ? ))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
835 (set-buffer buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
836 c)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
837 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
838 (set-buffer oldbuf) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
839 (let ((c (if (> (point) (point-min)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
840 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
841 (backward-char 1) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
842 (and (and (looking-at (flyspell-get-not-casechars)) 1) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
843 (and (or flyspell-consider-dash-as-word-delimiter-flag |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
844 (not (looking-at "\\-"))) 2)))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
845 (set-buffer buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
846 c)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
847 (insert (format " because : %S\n" |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
848 (cond |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
849 ((not (and (symbolp this-command) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
850 (get this-command 'flyspell-delayed))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
851 ;; the current command is not delayed, that |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
852 ;; is that we must check the word now |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
853 'not-delayed) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
854 ((progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
855 (set-buffer oldbuf) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
856 (let ((c (if (> (point) (point-min)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
857 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
858 (backward-char 1) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
859 (and (looking-at (flyspell-get-not-casechars)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
860 (or flyspell-consider-dash-as-word-delimiter-flag |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
861 (not (looking-at "\\-")))))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
862 (set-buffer buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
863 c)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
864 ;; yes because we have reached or typed a word delimiter. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
865 'separator) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
866 ((not (integerp flyspell-delay)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
867 ;; yes because the user had set up a no-delay configuration. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
868 'no-delay) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
869 (t |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
870 'sit-for)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
871 (goto-char (point-max))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
872 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
873 ;*---------------------------------------------------------------------*/ |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
874 ;* flyspell-debug-signal-changed-checked ... */ |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
875 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
876 (defun flyspell-debug-signal-changed-checked () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
877 (setq debug-on-error t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
878 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
879 (let ((buffer (get-buffer-create "*flyspell-debug*")) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
880 (point (point))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
881 (set-buffer buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
882 (insert "CHANGED WORD:\n") |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
883 (insert (format " point : %S\n" point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
884 (goto-char (point-max))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
885 |
| 22611 | 886 ;*---------------------------------------------------------------------*/ |
| 887 ;* flyspell-post-command-hook ... */ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
888 ;* ------------------------------------------------------------- */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
889 ;* It is possible that we check several words: */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
890 ;* 1- the current word is checked if the predicate */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
891 ;* FLYSPELL-CHECK-WORD-P is true */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
892 ;* 2- the word that used to be the current word before the */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
893 ;* THIS-COMMAND is checked if: */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
894 ;* a- the previous word is different from the current word */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
895 ;* b- the previous word as not just been checked by the */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
896 ;* previous FLYSPELL-POST-COMMAND-HOOK */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
897 ;* 3- the words changed by the THIS-COMMAND that are neither the */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
898 ;* previous word nor the current word */ |
| 22611 | 899 ;*---------------------------------------------------------------------*/ |
| 900 (defun flyspell-post-command-hook () | |
| 901 "The `post-command-hook' used by flyspell to check a word in-the-fly." | |
| 902 (interactive) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
903 (let ((command this-command)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
904 (if (flyspell-check-pre-word-p) |
| 22611 | 905 (save-excursion |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
906 '(flyspell-debug-signal-pre-word-checked) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
907 (set-buffer flyspell-pre-buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
908 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
909 (goto-char flyspell-pre-point) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
910 (flyspell-word)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
911 (if (flyspell-check-word-p) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
912 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
913 '(flyspell-debug-signal-word-checked) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
914 (flyspell-word) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
915 ;; we remember which word we have just checked. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
916 ;; this will be used next time we will check a word |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
917 ;; to compare the next current word with the word |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
918 ;; that as been registered in the pre-command-hook |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
919 ;; that is these variables are used within the predicate |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
920 ;; FLYSPELL-CHECK-PRE-WORD-P |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
921 (setq flyspell-pre-pre-buffer (current-buffer)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
922 (setq flyspell-pre-pre-point (point))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
923 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
924 (setq flyspell-pre-pre-buffer nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
925 (setq flyspell-pre-pre-point nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
926 ;; when a word is not checked because of a delayed command |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
927 ;; we do not disable the ispell cache. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
928 (if (and (symbolp this-command) (get this-command 'flyspell-delayed)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
929 (setq flyspell-word-cache-end -1)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
930 (while (consp flyspell-changes) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
931 (let ((start (car (car flyspell-changes))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
932 (stop (cdr (car flyspell-changes)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
933 (if (flyspell-check-changed-word-p start stop) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
934 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
935 '(flyspell-debug-signal-changed-checked) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
936 (goto-char start) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
937 (flyspell-word))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
938 (setq flyspell-changes (cdr flyspell-changes)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
939 (setq flyspell-previous-command command))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
940 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
941 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
942 ;* flyspell-notify-misspell ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
943 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
944 (defun flyspell-notify-misspell (start end word poss) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
945 (let ((replacements (if (stringp poss) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
946 poss |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
947 (if flyspell-sort-corrections |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
948 (sort (car (cdr (cdr poss))) 'string<) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
949 (car (cdr (cdr poss))))))) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
950 (if flyspell-issue-message-flag |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
951 (message (format "mispelling `%s' %S" word replacements))))) |
| 22611 | 952 |
| 953 ;*---------------------------------------------------------------------*/ | |
| 954 ;* flyspell-word ... */ | |
| 955 ;*---------------------------------------------------------------------*/ | |
| 956 (defun flyspell-word (&optional following) | |
| 957 "Spell check a word." | |
| 958 (interactive (list current-prefix-arg)) | |
| 959 (if (interactive-p) | |
| 960 (setq following ispell-following-word)) | |
| 961 (save-excursion | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
962 ;; use the correct dictionary |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
963 (flyspell-accept-buffer-local-defs) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
964 (let* ((cursor-location (point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
965 (flyspell-word (flyspell-get-word following)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
966 start end poss word) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
967 (if (or (eq flyspell-word nil) |
| 22611 | 968 (and (fboundp flyspell-generic-check-word-p) |
| 969 (not (funcall flyspell-generic-check-word-p)))) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
970 '() |
| 22611 | 971 (progn |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
972 ;; destructure return flyspell-word info list. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
973 (setq start (car (cdr flyspell-word)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
974 end (car (cdr (cdr flyspell-word))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
975 word (car flyspell-word)) |
| 22611 | 976 ;; before checking in the directory, we check for doublons. |
| 977 (cond | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
978 ((and (or (not (eq ispell-parser 'tex)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
979 (not (eq (char-after start) ?\\))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
980 flyspell-mark-duplications-flag |
| 22611 | 981 (save-excursion |
| 982 (goto-char start) | |
| 983 (word-search-backward word | |
| 984 (- start | |
| 985 (+ 1 (- end start))) | |
| 986 t))) | |
| 987 ;; yes, this is a doublon | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
988 (flyspell-highlight-incorrect-region start end 'doublon)) |
| 22611 | 989 ((and (eq flyspell-word-cache-start start) |
| 990 (eq flyspell-word-cache-end end) | |
| 991 (string-equal flyspell-word-cache-word word)) | |
| 992 ;; this word had been already checked, we skip | |
| 993 nil) | |
| 994 ((and (eq ispell-parser 'tex) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
995 (flyspell-tex-command-p flyspell-word)) |
| 22611 | 996 ;; this is a correct word (because a tex command) |
| 997 (flyspell-unhighlight-at start) | |
| 998 (if (> end start) | |
| 999 (flyspell-unhighlight-at (- end 1))) | |
| 1000 t) | |
| 1001 (t | |
| 1002 ;; we setup the cache | |
| 1003 (setq flyspell-word-cache-start start) | |
| 1004 (setq flyspell-word-cache-end end) | |
| 1005 (setq flyspell-word-cache-word word) | |
| 1006 ;; now check spelling of word. | |
| 1007 (process-send-string ispell-process "%\n") | |
| 1008 ;; put in verbose mode | |
| 1009 (process-send-string ispell-process | |
| 1010 (concat "^" word "\n")) | |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1011 ;; we mark the ispell process so it can be killed |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1012 ;; when emacs is exited without query |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1013 (if (fboundp 'process-kill-without-query) |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1014 (process-kill-without-query ispell-process)) |
| 22611 | 1015 ;; wait until ispell has processed word |
| 1016 (while (progn | |
| 1017 (accept-process-output ispell-process) | |
| 1018 (not (string= "" (car ispell-filter))))) | |
| 1019 ;; (process-send-string ispell-process "!\n") | |
| 1020 ;; back to terse mode. | |
| 1021 (setq ispell-filter (cdr ispell-filter)) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1022 (if (consp ispell-filter) |
| 22611 | 1023 (setq poss (ispell-parse-output (car ispell-filter)))) |
| 1024 (cond ((eq poss t) | |
| 1025 ;; correct | |
| 1026 (flyspell-unhighlight-at start) | |
| 1027 (if (> end start) | |
| 1028 (flyspell-unhighlight-at (- end 1))) | |
| 1029 t) | |
| 1030 ((and (stringp poss) flyspell-highlight-flag) | |
| 1031 ;; correct | |
| 1032 (flyspell-unhighlight-at start) | |
| 1033 (if (> end start) | |
| 1034 (flyspell-unhighlight-at (- end 1))) | |
| 1035 t) | |
| 1036 ((null poss) | |
| 1037 (flyspell-unhighlight-at start) | |
| 1038 (if (> end start) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1039 (flyspell-unhighlight-at (- end 1)))) |
| 22611 | 1040 ((or (and (< flyspell-duplicate-distance 0) |
| 1041 (or (save-excursion | |
| 1042 (goto-char start) | |
| 1043 (word-search-backward word | |
| 1044 (point-min) | |
| 1045 t)) | |
| 1046 (save-excursion | |
| 1047 (goto-char end) | |
| 1048 (word-search-forward word | |
| 1049 (point-max) | |
| 1050 t)))) | |
| 1051 (and (> flyspell-duplicate-distance 0) | |
| 1052 (or (save-excursion | |
| 1053 (goto-char start) | |
| 1054 (word-search-backward | |
| 1055 word | |
| 1056 (- start | |
| 1057 flyspell-duplicate-distance) | |
| 1058 t)) | |
| 1059 (save-excursion | |
| 1060 (goto-char end) | |
| 1061 (word-search-forward | |
| 1062 word | |
| 1063 (+ end | |
| 1064 flyspell-duplicate-distance) | |
| 1065 t))))) | |
| 1066 (if flyspell-highlight-flag | |
| 1067 (flyspell-highlight-duplicate-region start end) | |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1068 (message (format "duplicate `%s'" word)))) |
| 22611 | 1069 (t |
| 1070 ;; incorrect highlight the location | |
| 1071 (if flyspell-highlight-flag | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1072 (flyspell-highlight-incorrect-region start end poss) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1073 (flyspell-notify-misspell start end word poss)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1074 ;; return to original location |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
1075 (goto-char cursor-location) |
| 22611 | 1076 (if ispell-quit (setq ispell-quit nil))))))))) |
| 1077 | |
| 1078 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1079 ;* flyspell-tex-math-initialized ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1080 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1081 (defvar flyspell-tex-math-initialized nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1082 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1083 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1084 ;* flyspell-math-tex-command-p ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1085 ;* ------------------------------------------------------------- */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1086 ;* This function uses the texmathp package to check if (point) */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1087 ;* is within a tex command. In order to avoid using */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1088 ;* condition-case each time we use the variable */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1089 ;* flyspell-tex-math-initialized to make a special case the first */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1090 ;* time that function is called. */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1091 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1092 (defun flyspell-math-tex-command-p () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1093 (cond |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1094 (flyspell-check-tex-math-command |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1095 nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1096 ((eq flyspell-tex-math-initialized t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1097 (texmathp)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1098 ((eq flyspell-tex-math-initialized 'error) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1099 nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1100 (t |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1101 (setq flyspell-tex-math-initialized t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1102 (condition-case nil |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1103 (texmathp) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1104 (error (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1105 (setq flyspell-tex-math-initialized 'error) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1106 nil)))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1107 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1108 ;*---------------------------------------------------------------------*/ |
| 22611 | 1109 ;* flyspell-tex-command-p ... */ |
| 1110 ;*---------------------------------------------------------------------*/ | |
| 1111 (defun flyspell-tex-command-p (word) | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1112 "Return t if WORD is a TeX command." |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1113 (or (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1114 (let ((b (car (cdr word)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1115 (and (re-search-backward "\\\\" (- (point) 100) t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1116 (or (= (match-end 0) b) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1117 (and (goto-char (match-end 0)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1118 (looking-at flyspell-tex-command-regexp) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1119 (>= (match-end 0) b)))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1120 (flyspell-math-tex-command-p))) |
| 22611 | 1121 |
| 1122 ;*---------------------------------------------------------------------*/ | |
| 1123 ;* flyspell-casechars-cache ... */ | |
| 1124 ;*---------------------------------------------------------------------*/ | |
| 1125 (defvar flyspell-casechars-cache nil) | |
| 1126 (defvar flyspell-ispell-casechars-cache nil) | |
| 1127 (make-variable-buffer-local 'flyspell-casechars-cache) | |
| 1128 (make-variable-buffer-local 'flyspell-ispell-casechars-cache) | |
| 1129 | |
| 1130 ;*---------------------------------------------------------------------*/ | |
| 1131 ;* flyspell-get-casechars ... */ | |
| 1132 ;*---------------------------------------------------------------------*/ | |
| 1133 (defun flyspell-get-casechars () | |
| 1134 "This function builds a string that is the regexp of word chars. | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1135 In order to avoid one useless string construction, |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1136 this function changes the last char of the `ispell-casechars' string." |
| 22611 | 1137 (let ((ispell-casechars (ispell-get-casechars))) |
| 1138 (cond | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1139 ((eq ispell-parser 'tex) |
| 22611 | 1140 (setq flyspell-ispell-casechars-cache ispell-casechars) |
| 1141 (setq flyspell-casechars-cache | |
| 1142 (concat (substring ispell-casechars | |
| 1143 0 | |
| 1144 (- (length ispell-casechars) 1)) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1145 "]")) |
| 22611 | 1146 flyspell-casechars-cache) |
| 1147 (t | |
| 1148 (setq flyspell-ispell-casechars-cache ispell-casechars) | |
| 1149 (setq flyspell-casechars-cache ispell-casechars) | |
| 1150 flyspell-casechars-cache)))) | |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
1151 |
| 22611 | 1152 ;*---------------------------------------------------------------------*/ |
| 1153 ;* flyspell-get-not-casechars-cache ... */ | |
| 1154 ;*---------------------------------------------------------------------*/ | |
| 1155 (defvar flyspell-not-casechars-cache nil) | |
| 1156 (defvar flyspell-ispell-not-casechars-cache nil) | |
| 1157 (make-variable-buffer-local 'flyspell-not-casechars-cache) | |
| 1158 (make-variable-buffer-local 'flyspell-ispell-not-casechars-cache) | |
| 1159 | |
| 1160 ;*---------------------------------------------------------------------*/ | |
| 1161 ;* flyspell-get-not-casechars ... */ | |
| 1162 ;*---------------------------------------------------------------------*/ | |
| 1163 (defun flyspell-get-not-casechars () | |
| 1164 "This function builds a string that is the regexp of non-word chars." | |
| 1165 (let ((ispell-not-casechars (ispell-get-not-casechars))) | |
| 1166 (cond | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1167 ((eq ispell-parser 'tex) |
| 22611 | 1168 (setq flyspell-ispell-not-casechars-cache ispell-not-casechars) |
| 1169 (setq flyspell-not-casechars-cache | |
| 1170 (concat (substring ispell-not-casechars | |
| 1171 0 | |
| 1172 (- (length ispell-not-casechars) 1)) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1173 "]")) |
| 22611 | 1174 flyspell-not-casechars-cache) |
| 1175 (t | |
| 1176 (setq flyspell-ispell-not-casechars-cache ispell-not-casechars) | |
| 1177 (setq flyspell-not-casechars-cache ispell-not-casechars) | |
| 1178 flyspell-not-casechars-cache)))) | |
| 1179 | |
| 1180 ;*---------------------------------------------------------------------*/ | |
| 1181 ;* flyspell-get-word ... */ | |
| 1182 ;*---------------------------------------------------------------------*/ | |
| 1183 (defun flyspell-get-word (following) | |
| 1184 "Return the word for spell-checking according to Ispell syntax. | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1185 If argument FOLLOWING is non-nil or if `ispell-following-word' |
| 22611 | 1186 is non-nil when called interactively, then the following word |
| 1187 \(rather than preceding\) is checked when the cursor is not over a word. | |
| 37008 | 1188 Optional second argument contains other chars that can be included in word |
| 22611 | 1189 many times. |
| 1190 | |
| 1191 Word syntax described by `ispell-dictionary-alist' (which see)." | |
| 1192 (let* ((flyspell-casechars (flyspell-get-casechars)) | |
| 1193 (flyspell-not-casechars (flyspell-get-not-casechars)) | |
| 1194 (ispell-otherchars (ispell-get-otherchars)) | |
| 1195 (ispell-many-otherchars-p (ispell-get-many-otherchars-p)) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1196 (word-regexp (if (string< "" ispell-otherchars) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1197 (concat flyspell-casechars |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1198 "+\\(" |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1199 ispell-otherchars |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1200 "?" |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1201 flyspell-casechars |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1202 "+\\)" |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1203 (if ispell-many-otherchars-p |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1204 "*" "?")) |
|
24943
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1205 (concat flyspell-casechars "+"))) |
| 22611 | 1206 did-it-once |
| 1207 start end word) | |
| 1208 ;; find the word | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1209 (if (not (looking-at flyspell-casechars)) |
| 22611 | 1210 (if following |
| 1211 (re-search-forward flyspell-casechars (point-max) t) | |
| 1212 (re-search-backward flyspell-casechars (point-min) t))) | |
| 1213 ;; move to front of word | |
| 1214 (re-search-backward flyspell-not-casechars (point-min) 'start) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1215 (let ((pos nil)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1216 (if (string< "" ispell-otherchars) |
|
24943
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1217 (while (and (looking-at ispell-otherchars) |
|
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1218 (not (bobp)) |
|
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1219 (or (not did-it-once) |
|
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1220 ispell-many-otherchars-p) |
|
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1221 (not (eq pos (point)))) |
|
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1222 (setq pos (point)) |
|
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1223 (setq did-it-once t) |
|
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1224 (backward-char 1) |
|
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1225 (if (looking-at flyspell-casechars) |
|
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1226 (re-search-backward flyspell-not-casechars (point-min) 'move) |
|
59585a4135a6
(flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents:
24458
diff
changeset
|
1227 (backward-char -1))))) |
| 22611 | 1228 ;; Now mark the word and save to string. |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1229 (if (eq (re-search-forward word-regexp (point-max) t) nil) |
| 22611 | 1230 nil |
| 1231 (progn | |
| 1232 (setq start (match-beginning 0) | |
| 1233 end (point) | |
|
36129
4c28e9406f50
(flyspell-get-word): Return string without
Dave Love <fx@gnu.org>
parents:
36120
diff
changeset
|
1234 word (buffer-substring-no-properties start end)) |
| 22611 | 1235 (list word start end))))) |
| 1236 | |
| 1237 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1238 ;* flyspell-small-region ... */ |
| 22611 | 1239 ;*---------------------------------------------------------------------*/ |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1240 (defun flyspell-small-region (beg end) |
| 22611 | 1241 "Flyspell text between BEG and END." |
| 1242 (save-excursion | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1243 (if (> beg end) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1244 (let ((old beg)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1245 (setq beg end) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1246 (setq end old))) |
| 22611 | 1247 (goto-char beg) |
|
22612
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1248 (let ((count 0)) |
|
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1249 (while (< (point) end) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1250 (if (and flyspell-issue-message-flag (= count 100)) |
|
22612
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1251 (progn |
|
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1252 (message "Spell Checking...%d%%" |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1253 (* 100 (/ (float (- (point) beg)) (- end beg)))) |
|
22612
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1254 (setq count 0)) |
|
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1255 (setq count (+ 1 count))) |
|
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1256 (flyspell-word) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1257 (sit-for 0) |
|
22612
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1258 (let ((cur (point))) |
|
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1259 (forward-word 1) |
|
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1260 (if (and (< (point) end) (> (point) (+ cur 1))) |
|
6def3da74c7c
Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents:
22611
diff
changeset
|
1261 (backward-char 1))))) |
| 22611 | 1262 (backward-char 1) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1263 (if flyspell-issue-message-flag (message "Spell Checking completed.")) |
| 22611 | 1264 (flyspell-word))) |
| 1265 | |
| 1266 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1267 ;* flyspell-external-ispell-process ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1268 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1269 (defvar flyspell-external-ispell-process '() |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
1270 "The external Flyspell Ispell process.") |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1271 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1272 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1273 ;* flyspell-external-ispell-buffer ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1274 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1275 (defvar flyspell-external-ispell-buffer '()) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1276 (defvar flyspell-large-region-buffer '()) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1277 (defvar flyspell-large-region-beg (point-min)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1278 (defvar flyspell-large-region-end (point-max)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1279 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1280 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1281 ;* flyspell-external-point-words ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1282 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1283 (defun flyspell-external-point-words () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1284 (let ((buffer flyspell-external-ispell-buffer)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1285 (set-buffer buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1286 (beginning-of-buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1287 (let ((size (- flyspell-large-region-end flyspell-large-region-beg)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1288 (start flyspell-large-region-beg)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1289 ;; now we are done with ispell, we have to find the word in |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1290 ;; the initial buffer |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1291 (while (< (point) (- (point-max) 1)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1292 ;; we have to fetch the incorrect word |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1293 (if (re-search-forward "\\([^\n]+\\)\n" (point-max) t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1294 (let ((word (match-string 1))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1295 (goto-char (match-end 0)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1296 (set-buffer flyspell-large-region-buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1297 (goto-char flyspell-large-region-beg) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1298 (if flyspell-issue-message-flag |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1299 (message "Spell Checking...%d%% [%s]" |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1300 (* 100 (/ (float (- (point) start)) size)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1301 word)) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1302 (if (search-forward word flyspell-large-region-end t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1303 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1304 (setq flyspell-large-region-beg (point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1305 (goto-char (- (point) 1)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1306 (flyspell-word))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1307 (set-buffer buffer)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1308 (goto-char (point-max))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1309 ;; we are done |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1310 (if flyspell-issue-message-flag (message "Spell Checking completed.")) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1311 ;; ok, we are done with pointing out incorrect words, we just |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1312 ;; have to kill the temporary buffer |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1313 (kill-buffer flyspell-external-ispell-buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1314 (setq flyspell-external-ispell-buffer nil))) |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
1315 |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1316 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1317 ;* flyspell-large-region ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1318 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1319 (defun flyspell-large-region (beg end) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1320 (let* ((curbuf (current-buffer)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1321 (buffer (get-buffer-create "*flyspell-region*"))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1322 (setq flyspell-external-ispell-buffer buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1323 (setq flyspell-large-region-buffer curbuf) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1324 (setq flyspell-large-region-beg beg) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1325 (setq flyspell-large-region-end end) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1326 (set-buffer buffer) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1327 (erase-buffer) |
| 37008 | 1328 ;; this is done, we can start checking... |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1329 (if flyspell-issue-message-flag (message "Checking region...")) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1330 (set-buffer curbuf) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1331 (let ((c (apply 'call-process-region beg |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1332 end |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1333 ispell-program-name |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1334 nil |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1335 buffer |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1336 nil |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1337 "-l" |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1338 (let (args) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1339 ;; Local dictionary becomes the global dictionary in use. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1340 (if ispell-local-dictionary |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1341 (setq ispell-dictionary ispell-local-dictionary)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1342 (setq args (ispell-get-ispell-args)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1343 (if ispell-dictionary ; use specified dictionary |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1344 (setq args |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1345 (append (list "-d" ispell-dictionary) args))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1346 (if ispell-personal-dictionary ; use specified pers dict |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1347 (setq args |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1348 (append args |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1349 (list "-p" |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1350 (expand-file-name |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1351 ispell-personal-dictionary))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1352 (setq args (append args ispell-extra-args)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1353 args)))) |
|
53477
79093b308520
* progmodes/idlwave.el (idlwave-make-tags):
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53420
diff
changeset
|
1354 (if (eq c 0) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1355 (flyspell-external-point-words) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1356 (error "Can't check region..."))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1357 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1358 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1359 ;* flyspell-region ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1360 ;* ------------------------------------------------------------- */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1361 ;* Because `ispell -a' is too slow, it is not possible to use */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1362 ;* it on large region. Then, when ispell is invoked on a large */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1363 ;* text region, a new `ispell -l' process is spawned. The */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1364 ;* pointed out words are then searched in the region a checked with */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1365 ;* regular flyspell means. */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1366 ;*---------------------------------------------------------------------*/ |
|
36120
927cbaaa27f8
(flyspell-region, flyspell-buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
35617
diff
changeset
|
1367 ;;;###autoload |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1368 (defun flyspell-region (beg end) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1369 "Flyspell text between BEG and END." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1370 (interactive "r") |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1371 (if (= beg end) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1372 () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1373 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1374 (if (> beg end) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1375 (let ((old beg)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1376 (setq beg end) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1377 (setq end old))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1378 (if (> (- end beg) flyspell-large-region) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1379 (flyspell-large-region beg end) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1380 (flyspell-small-region beg end))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1381 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1382 ;*---------------------------------------------------------------------*/ |
| 22611 | 1383 ;* flyspell-buffer ... */ |
| 1384 ;*---------------------------------------------------------------------*/ | |
|
36120
927cbaaa27f8
(flyspell-region, flyspell-buffer):
Gerd Moellmann <gerd@gnu.org>
parents:
35617
diff
changeset
|
1385 ;;;###autoload |
| 22611 | 1386 (defun flyspell-buffer () |
| 1387 "Flyspell whole buffer." | |
| 1388 (interactive) | |
| 1389 (flyspell-region (point-min) (point-max))) | |
| 1390 | |
| 1391 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1392 ;* old next error position ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1393 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1394 (defvar flyspell-old-buffer-error nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1395 (defvar flyspell-old-pos-error nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1396 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1397 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1398 ;* flyspell-goto-next-error ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1399 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1400 (defun flyspell-goto-next-error () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1401 "Go to the next previously detected error. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1402 In general FLYSPELL-GOTO-NEXT-ERROR must be used after |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1403 FLYSPELL-BUFFER." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1404 (interactive) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1405 (let ((pos (point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1406 (max (point-max))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1407 (if (and (eq (current-buffer) flyspell-old-buffer-error) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1408 (eq pos flyspell-old-pos-error)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1409 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1410 (if (= flyspell-old-pos-error max) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1411 ;; goto beginning of buffer |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1412 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1413 (message "Restarting from beginning of buffer") |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1414 (goto-char (point-min))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1415 (forward-word 1)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1416 (setq pos (point)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1417 ;; seek the next error |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1418 (while (and (< pos max) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1419 (let ((ovs (overlays-at pos)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1420 (r '())) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1421 (while (and (not r) (consp ovs)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1422 (if (flyspell-overlay-p (car ovs)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1423 (setq r t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1424 (setq ovs (cdr ovs)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1425 (not r))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1426 (setq pos (1+ pos))) |
| 37008 | 1427 ;; save the current location for next invocation |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1428 (setq flyspell-old-pos-error pos) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1429 (setq flyspell-old-buffer-error (current-buffer)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1430 (goto-char pos) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1431 (if (= pos max) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1432 (message "No more miss-spelled word!")))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1433 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1434 ;*---------------------------------------------------------------------*/ |
| 22611 | 1435 ;* flyspell-overlay-p ... */ |
| 1436 ;*---------------------------------------------------------------------*/ | |
| 1437 (defun flyspell-overlay-p (o) | |
| 1438 "A predicate that return true iff O is an overlay used by flyspell." | |
| 1439 (and (overlayp o) (overlay-get o 'flyspell-overlay))) | |
| 1440 | |
| 1441 ;*---------------------------------------------------------------------*/ | |
| 1442 ;* flyspell-delete-all-overlays ... */ | |
| 1443 ;* ------------------------------------------------------------- */ | |
| 1444 ;* Remove all the overlays introduced by flyspell. */ | |
| 1445 ;*---------------------------------------------------------------------*/ | |
| 1446 (defun flyspell-delete-all-overlays () | |
| 1447 "Delete all the overlays used by flyspell." | |
| 1448 (let ((l (overlays-in (point-min) (point-max)))) | |
| 1449 (while (consp l) | |
| 1450 (progn | |
| 1451 (if (flyspell-overlay-p (car l)) | |
| 1452 (delete-overlay (car l))) | |
| 1453 (setq l (cdr l)))))) | |
| 1454 | |
| 1455 ;*---------------------------------------------------------------------*/ | |
| 1456 ;* flyspell-unhighlight-at ... */ | |
| 1457 ;*---------------------------------------------------------------------*/ | |
| 1458 (defun flyspell-unhighlight-at (pos) | |
| 1459 "Remove the flyspell overlay that are located at POS." | |
| 1460 (if flyspell-persistent-highlight | |
| 1461 (let ((overlays (overlays-at pos))) | |
| 1462 (while (consp overlays) | |
| 1463 (if (flyspell-overlay-p (car overlays)) | |
| 1464 (delete-overlay (car overlays))) | |
| 1465 (setq overlays (cdr overlays)))) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1466 (if (flyspell-overlay-p flyspell-overlay) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1467 (delete-overlay flyspell-overlay)))) |
| 22611 | 1468 |
| 1469 ;*---------------------------------------------------------------------*/ | |
| 1470 ;* flyspell-properties-at-p ... */ | |
| 1471 ;* ------------------------------------------------------------- */ | |
| 1472 ;* Is there an highlight properties at position pos? */ | |
| 1473 ;*---------------------------------------------------------------------*/ | |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1474 (defun flyspell-properties-at-p (pos) |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1475 "Return t if there is a text property at POS, not counting `local-map'. |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1476 If variable `flyspell-highlight-properties' is set to nil, |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1477 text with properties are not checked. This function is used to discover |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1478 if the character at POS has any other property." |
|
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1479 (let ((prop (text-properties-at pos)) |
| 22611 | 1480 (keep t)) |
| 1481 (while (and keep (consp prop)) | |
| 1482 (if (and (eq (car prop) 'local-map) (consp (cdr prop))) | |
| 1483 (setq prop (cdr (cdr prop))) | |
| 1484 (setq keep nil))) | |
| 1485 (consp prop))) | |
| 1486 | |
| 1487 ;*---------------------------------------------------------------------*/ | |
| 1488 ;* make-flyspell-overlay ... */ | |
| 1489 ;*---------------------------------------------------------------------*/ | |
| 1490 (defun make-flyspell-overlay (beg end face mouse-face) | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1491 "Allocate an overlay to highlight an incorrect word. |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1492 BEG and END specify the range in the buffer of that word. |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1493 FACE and MOUSE-FACE specify the `face' and `mouse-face' properties |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1494 for the overlay." |
|
24076
6236e60302e2
(make-flyspell-overlay): fix front stickiness.
Richard M. Stallman <rms@gnu.org>
parents:
23943
diff
changeset
|
1495 (let ((flyspell-overlay (make-overlay beg end nil t nil))) |
| 22611 | 1496 (overlay-put flyspell-overlay 'face face) |
| 1497 (overlay-put flyspell-overlay 'mouse-face mouse-face) | |
| 1498 (overlay-put flyspell-overlay 'flyspell-overlay t) | |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1499 (overlay-put flyspell-overlay 'evaporate t) |
|
45184
fe852d8d5495
(make-flyspell-overlay): Add help text to flyspell overlays.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43444
diff
changeset
|
1500 (overlay-put flyspell-overlay 'help-echo "mouse-2: correct word at point") |
|
23943
7555c77bc4f0
If local-maps work, don't put
Richard M. Stallman <rms@gnu.org>
parents:
23788
diff
changeset
|
1501 (if flyspell-use-local-map |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1502 (overlay-put flyspell-overlay |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1503 flyspell-overlay-keymap-property-name |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1504 flyspell-mouse-map)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1505 (when (eq face 'flyspell-incorrect-face) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1506 (and (stringp flyspell-before-incorrect-word-string) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1507 (overlay-put flyspell-overlay 'before-string |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1508 flyspell-before-incorrect-word-string)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1509 (and (stringp flyspell-after-incorrect-word-string) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1510 (overlay-put flyspell-overlay 'after-string |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1511 flyspell-after-incorrect-word-string))) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1512 flyspell-overlay)) |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
1513 |
| 22611 | 1514 ;*---------------------------------------------------------------------*/ |
| 1515 ;* flyspell-highlight-incorrect-region ... */ | |
| 1516 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1517 (defun flyspell-highlight-incorrect-region (beg end poss) |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1518 "Set up an overlay on a misspelled word, in the buffer from BEG to END." |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1519 (unless (run-hook-with-args-until-success |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1520 'flyspell-incorrect-hook beg end poss) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1521 (if (or flyspell-highlight-properties (not (flyspell-properties-at-p beg))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1522 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1523 ;; we cleanup current overlay at the same position |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1524 (if (and (not flyspell-persistent-highlight) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1525 (overlayp flyspell-overlay)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1526 (delete-overlay flyspell-overlay) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1527 (let ((overlays (overlays-at beg))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1528 (while (consp overlays) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1529 (if (flyspell-overlay-p (car overlays)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1530 (delete-overlay (car overlays))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1531 (setq overlays (cdr overlays))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1532 ;; now we can use a new overlay |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1533 (setq flyspell-overlay |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1534 (make-flyspell-overlay beg end |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
1535 'flyspell-incorrect-face |
|
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
1536 'highlight)))))) |
| 22611 | 1537 |
| 1538 ;*---------------------------------------------------------------------*/ | |
| 1539 ;* flyspell-highlight-duplicate-region ... */ | |
| 1540 ;*---------------------------------------------------------------------*/ | |
| 1541 (defun flyspell-highlight-duplicate-region (beg end) | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1542 "Set up an overlay on a duplicated word, in the buffer from BEG to END." |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1543 (if (or flyspell-highlight-properties (not (flyspell-properties-at-p beg))) |
| 22611 | 1544 (progn |
| 1545 ;; we cleanup current overlay at the same position | |
| 1546 (if (and (not flyspell-persistent-highlight) | |
| 1547 (overlayp flyspell-overlay)) | |
| 1548 (delete-overlay flyspell-overlay) | |
| 1549 (let ((overlays (overlays-at beg))) | |
| 1550 (while (consp overlays) | |
| 1551 (if (flyspell-overlay-p (car overlays)) | |
| 1552 (delete-overlay (car overlays))) | |
| 1553 (setq overlays (cdr overlays))))) | |
| 1554 ;; now we can use a new overlay | |
| 1555 (setq flyspell-overlay | |
| 1556 (make-flyspell-overlay beg end | |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1557 'flyspell-duplicate-face |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1558 'highlight))))) |
| 22611 | 1559 |
| 1560 ;*---------------------------------------------------------------------*/ | |
| 1561 ;* flyspell-auto-correct-cache ... */ | |
| 1562 ;*---------------------------------------------------------------------*/ | |
| 1563 (defvar flyspell-auto-correct-pos nil) | |
| 1564 (defvar flyspell-auto-correct-region nil) | |
| 1565 (defvar flyspell-auto-correct-ring nil) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1566 (defvar flyspell-auto-correct-word nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1567 (make-variable-buffer-local 'flyspell-auto-correct-pos) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1568 (make-variable-buffer-local 'flyspell-auto-correct-region) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1569 (make-variable-buffer-local 'flyspell-auto-correct-ring) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1570 (make-variable-buffer-local 'flyspell-auto-correct-word) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1571 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1572 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1573 ;* flyspell-check-previous-highlighted-word ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1574 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1575 (defun flyspell-check-previous-highlighted-word (&optional arg) |
| 37008 | 1576 "Correct the closer misspelled word. |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1577 This function scans a mis-spelled word before the cursor. If it finds one |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1578 it proposes replacement for that word. With prefix arg, count that many |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1579 misspelled words backwards." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1580 (interactive) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1581 (let ((pos1 (point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1582 (pos (point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1583 (arg (if (or (not (numberp arg)) (< arg 1)) 1 arg)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1584 ov ovs) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1585 (if (catch 'exit |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1586 (while (and (setq pos (previous-overlay-change pos)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1587 (not (= pos pos1))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1588 (setq pos1 pos) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1589 (if (> pos (point-min)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1590 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1591 (setq ovs (overlays-at (1- pos))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1592 (while (consp ovs) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1593 (setq ov (car ovs)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1594 (setq ovs (cdr ovs)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1595 (if (and (overlay-get ov 'flyspell-overlay) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1596 (= 0 (setq arg (1- arg)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1597 (throw 'exit t))))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1598 (save-excursion |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1599 (goto-char pos) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1600 (ispell-word)) |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
1601 (error "No word to correct before point")))) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1602 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1603 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1604 ;* flyspell-display-next-corrections ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1605 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1606 (defun flyspell-display-next-corrections (corrections) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1607 (let ((string "Corrections:") |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1608 (l corrections) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1609 (pos '())) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1610 (while (< (length string) 80) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1611 (if (equal (car l) flyspell-auto-correct-word) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1612 (setq pos (cons (+ 1 (length string)) pos))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1613 (setq string (concat string " " (car l))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1614 (setq l (cdr l))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1615 (while (consp pos) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1616 (let ((num (car pos))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1617 (put-text-property num |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1618 (+ num (length flyspell-auto-correct-word)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1619 'face |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1620 'flyspell-incorrect-face |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1621 string)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1622 (setq pos (cdr pos))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1623 (if (fboundp 'display-message) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1624 (display-message 'no-log string) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1625 (message string)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1626 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1627 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1628 ;* flyspell-abbrev-table ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1629 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1630 (defun flyspell-abbrev-table () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1631 (if flyspell-use-global-abbrev-table-p |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1632 global-abbrev-table |
|
53420
95e0a0bdebb2
(mail-mode-flyspell-verify): Search for header separator alone on a
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1633 (or local-abbrev-table global-abbrev-table))) |
| 22611 | 1634 |
| 1635 ;*---------------------------------------------------------------------*/ | |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1636 ;* flyspell-define-abbrev ... */ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1637 ;*---------------------------------------------------------------------*/ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1638 (defun flyspell-define-abbrev (name expansion) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1639 (let ((table (flyspell-abbrev-table))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1640 (when table |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1641 (define-abbrev table name expansion)))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1642 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1643 ;*---------------------------------------------------------------------*/ |
| 22611 | 1644 ;* flyspell-auto-correct-word ... */ |
| 1645 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1646 (defun flyspell-auto-correct-word () |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1647 "Correct the current word. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1648 This command proposes various successive corrections for the current word." |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1649 (interactive) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1650 (let ((pos (point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1651 (old-max (point-max))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1652 ;; use the correct dictionary |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1653 (flyspell-accept-buffer-local-defs) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1654 (if (and (eq flyspell-auto-correct-pos pos) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1655 (consp flyspell-auto-correct-region)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1656 ;; we have already been using the function at the same location |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1657 (let* ((start (car flyspell-auto-correct-region)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1658 (len (cdr flyspell-auto-correct-region))) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1659 (flyspell-unhighlight-at start) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1660 (delete-region start (+ start len)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1661 (setq flyspell-auto-correct-ring (cdr flyspell-auto-correct-ring)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1662 (let* ((word (car flyspell-auto-correct-ring)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1663 (len (length word))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1664 (rplacd flyspell-auto-correct-region len) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1665 (goto-char start) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1666 (if flyspell-abbrev-p |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1667 (if (flyspell-already-abbrevp (flyspell-abbrev-table) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1668 flyspell-auto-correct-word) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1669 (flyspell-change-abbrev (flyspell-abbrev-table) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1670 flyspell-auto-correct-word |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1671 word) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1672 (flyspell-define-abbrev flyspell-auto-correct-word word))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1673 (funcall flyspell-insert-function word) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1674 (flyspell-word) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1675 (flyspell-display-next-corrections flyspell-auto-correct-ring)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1676 (flyspell-ajust-cursor-point pos (point) old-max) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1677 (setq flyspell-auto-correct-pos (point))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1678 ;; fetch the word to be checked |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1679 (let ((word (flyspell-get-word nil)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1680 start end poss) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1681 ;; destructure return word info list. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1682 (setq start (car (cdr word)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1683 end (car (cdr (cdr word))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1684 word (car word)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1685 (setq flyspell-auto-correct-word word) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1686 ;; now check spelling of word. |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1687 (process-send-string ispell-process "%\n") ;put in verbose mode |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1688 (process-send-string ispell-process (concat "^" word "\n")) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1689 ;; wait until ispell has processed word |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1690 (while (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1691 (accept-process-output ispell-process) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1692 (not (string= "" (car ispell-filter))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1693 (setq ispell-filter (cdr ispell-filter)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1694 (if (consp ispell-filter) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1695 (setq poss (ispell-parse-output (car ispell-filter)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1696 (cond ((or (eq poss t) (stringp poss)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1697 ;; don't correct word |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1698 t) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1699 ((null poss) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1700 ;; ispell error |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1701 (error "Ispell: error in Ispell process")) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1702 (t |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1703 ;; the word is incorrect, we have to propose a replacement |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1704 (let ((replacements (if flyspell-sort-corrections |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1705 (sort (car (cdr (cdr poss))) 'string<) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1706 (car (cdr (cdr poss)))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1707 (setq flyspell-auto-correct-region nil) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1708 (if (consp replacements) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1709 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1710 (let ((replace (car replacements))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1711 (let ((new-word replace)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1712 (if (not (equal new-word (car poss))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1713 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1714 ;; the save the current replacements |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1715 (setq flyspell-auto-correct-region |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1716 (cons start (length new-word))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1717 (let ((l replacements)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1718 (while (consp (cdr l)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1719 (setq l (cdr l))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1720 (rplacd l (cons (car poss) replacements))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1721 (setq flyspell-auto-correct-ring |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1722 replacements) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1723 (flyspell-unhighlight-at start) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1724 (delete-region start end) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1725 (funcall flyspell-insert-function new-word) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1726 (if flyspell-abbrev-p |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1727 (if (flyspell-already-abbrevp |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1728 (flyspell-abbrev-table) word) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1729 (flyspell-change-abbrev |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1730 (flyspell-abbrev-table) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1731 word |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1732 new-word) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1733 (flyspell-define-abbrev word new-word))) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1734 (flyspell-word) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1735 (flyspell-display-next-corrections |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1736 (cons new-word flyspell-auto-correct-ring)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1737 (flyspell-ajust-cursor-point pos |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1738 (point) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1739 old-max)))))))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1740 (setq flyspell-auto-correct-pos (point)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1741 (ispell-pdict-save t))))) |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
1742 |
| 22611 | 1743 ;*---------------------------------------------------------------------*/ |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1744 ;* flyspell-auto-correct-previous-pos ... */ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1745 ;*---------------------------------------------------------------------*/ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1746 (defvar flyspell-auto-correct-previous-pos nil |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1747 "Holds the start of the first incorrect word before point.") |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1748 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1749 ;*---------------------------------------------------------------------*/ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1750 ;* flyspell-auto-correct-previous-hook ... */ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1751 ;*---------------------------------------------------------------------*/ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1752 (defun flyspell-auto-correct-previous-hook () |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1753 "Hook to track successive calls to `flyspell-auto-correct-previous-word'. |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1754 Sets flyspell-auto-correct-previous-pos to nil" |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1755 (interactive) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1756 (remove-hook 'pre-command-hook (function flyspell-auto-correct-previous-hook) t) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1757 (unless (eq this-command (function flyspell-auto-correct-previous-word)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1758 (setq flyspell-auto-correct-previous-pos nil))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1759 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1760 ;*---------------------------------------------------------------------*/ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1761 ;* flyspell-auto-correct-previous-word ... */ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1762 ;*---------------------------------------------------------------------*/ |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1763 (defun flyspell-auto-correct-previous-word (position) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1764 "*Auto correct the first mispelled word that occurs before point." |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1765 (interactive "d") |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1766 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1767 (add-hook 'pre-command-hook |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1768 (function flyspell-auto-correct-previous-hook) t t) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1769 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1770 (save-excursion |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1771 (unless flyspell-auto-correct-previous-pos |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1772 ;; only reset if a new overlay exists |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1773 (setq flyspell-auto-correct-previous-pos nil) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1774 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1775 (let ((overlay-list (overlays-in (point-min) position)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1776 (new-overlay 'dummy-value)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1777 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1778 ;; search for previous (new) flyspell overlay |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1779 (while (and new-overlay |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1780 (or (not (flyspell-overlay-p new-overlay)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1781 ;; check if its face has changed |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1782 (not (eq (get-char-property |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1783 (overlay-start new-overlay) 'face) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1784 'flyspell-incorrect-face)))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1785 (setq new-overlay (car-safe overlay-list)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1786 (setq overlay-list (cdr-safe overlay-list))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1787 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1788 ;; if nothing new exits new-overlay should be nil |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1789 (if new-overlay;; the length of the word may change so go to the start |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1790 (setq flyspell-auto-correct-previous-pos |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1791 (overlay-start new-overlay))))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1792 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1793 (when flyspell-auto-correct-previous-pos |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1794 (save-excursion |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1795 (goto-char flyspell-auto-correct-previous-pos) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1796 (let ((ispell-following-word t));; point is at start |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1797 (if (numberp flyspell-auto-correct-previous-pos) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1798 (goto-char flyspell-auto-correct-previous-pos)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1799 (flyspell-auto-correct-word)) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1800 ;; the point may have moved so reset this |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1801 (setq flyspell-auto-correct-previous-pos (point)))))) |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1802 |
|
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1803 ;*---------------------------------------------------------------------*/ |
| 22611 | 1804 ;* flyspell-correct-word ... */ |
| 1805 ;*---------------------------------------------------------------------*/ | |
| 1806 (defun flyspell-correct-word (event) | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1807 "Pop up a menu of possible corrections for a misspelled word. |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1808 The word checked is the word at the mouse position." |
| 22611 | 1809 (interactive "e") |
| 1810 ;; use the correct dictionary | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1811 (flyspell-accept-buffer-local-defs) |
| 22611 | 1812 ;; retain cursor location (I don't know why but save-excursion here fails). |
| 1813 (let ((save (point))) | |
| 1814 (mouse-set-point event) | |
| 1815 (let ((cursor-location (point)) | |
| 1816 (word (flyspell-get-word nil)) | |
| 1817 start end poss replace) | |
| 1818 ;; destructure return word info list. | |
| 1819 (setq start (car (cdr word)) | |
| 1820 end (car (cdr (cdr word))) | |
| 1821 word (car word)) | |
| 1822 ;; now check spelling of word. | |
| 1823 (process-send-string ispell-process "%\n") ;put in verbose mode | |
| 1824 (process-send-string ispell-process (concat "^" word "\n")) | |
| 1825 ;; wait until ispell has processed word | |
| 1826 (while (progn | |
| 1827 (accept-process-output ispell-process) | |
| 1828 (not (string= "" (car ispell-filter))))) | |
| 1829 (setq ispell-filter (cdr ispell-filter)) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1830 (if (consp ispell-filter) |
| 22611 | 1831 (setq poss (ispell-parse-output (car ispell-filter)))) |
| 1832 (cond ((or (eq poss t) (stringp poss)) | |
| 1833 ;; don't correct word | |
| 1834 t) | |
| 1835 ((null poss) | |
| 1836 ;; ispell error | |
| 1837 (error "Ispell: error in Ispell process")) | |
| 1838 ((string-match "GNU" (emacs-version)) | |
| 1839 ;; the word is incorrect, we have to propose a replacement | |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1840 (setq replace (flyspell-emacs-popup event poss word)) |
| 22611 | 1841 (cond ((eq replace 'ignore) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1842 (goto-char save) |
| 22611 | 1843 nil) |
| 1844 ((eq replace 'save) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1845 (goto-char save) |
| 22611 | 1846 (process-send-string ispell-process (concat "*" word "\n")) |
| 1847 (flyspell-unhighlight-at cursor-location) | |
| 1848 (setq ispell-pdict-modified-p '(t))) | |
| 1849 ((or (eq replace 'buffer) (eq replace 'session)) | |
| 1850 (process-send-string ispell-process (concat "@" word "\n")) | |
| 1851 (if (null ispell-pdict-modified-p) | |
| 1852 (setq ispell-pdict-modified-p | |
| 1853 (list ispell-pdict-modified-p))) | |
| 1854 (flyspell-unhighlight-at cursor-location) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1855 (goto-char save) |
| 22611 | 1856 (if (eq replace 'buffer) |
| 1857 (ispell-add-per-file-word-list word))) | |
| 1858 (replace | |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1859 (flyspell-unhighlight-at cursor-location) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1860 (let ((new-word (if (atom replace) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1861 replace |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1862 (car replace))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1863 (cursor-location (+ (- (length word) (- end start)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1864 cursor-location))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1865 (if (not (equal new-word (car poss))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1866 (let ((old-max (point-max))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1867 (delete-region start end) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1868 (funcall flyspell-insert-function new-word) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1869 (if flyspell-abbrev-p |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1870 (flyspell-define-abbrev word new-word)) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1871 (flyspell-ajust-cursor-point save |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1872 cursor-location |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1873 old-max))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1874 (t |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1875 (goto-char save) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1876 nil))) |
|
27787
d40d47971e6b
(flyspell-mouse-map): Change definition
Dave Love <fx@gnu.org>
parents:
24943
diff
changeset
|
1877 ((eq flyspell-emacs 'xemacs) |
| 22611 | 1878 (flyspell-xemacs-popup |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1879 event poss word cursor-location start end save) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1880 (goto-char save))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1881 (ispell-pdict-save t)))) |
| 22611 | 1882 |
| 1883 ;*---------------------------------------------------------------------*/ | |
| 1884 ;* flyspell-xemacs-correct ... */ | |
| 1885 ;*---------------------------------------------------------------------*/ | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1886 (defun flyspell-xemacs-correct (replace poss word cursor-location start end save) |
| 22611 | 1887 "The xemacs popup menu callback." |
| 1888 (cond ((eq replace 'ignore) | |
| 1889 nil) | |
| 1890 ((eq replace 'save) | |
| 1891 (process-send-string ispell-process (concat "*" word "\n")) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1892 (process-send-string ispell-process "#\n") |
| 22611 | 1893 (flyspell-unhighlight-at cursor-location) |
| 1894 (setq ispell-pdict-modified-p '(t))) | |
| 1895 ((or (eq replace 'buffer) (eq replace 'session)) | |
| 1896 (process-send-string ispell-process (concat "@" word "\n")) | |
| 1897 (flyspell-unhighlight-at cursor-location) | |
| 1898 (if (null ispell-pdict-modified-p) | |
| 1899 (setq ispell-pdict-modified-p | |
| 1900 (list ispell-pdict-modified-p))) | |
| 1901 (if (eq replace 'buffer) | |
| 1902 (ispell-add-per-file-word-list word))) | |
| 1903 (replace | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1904 (let ((old-max (point-max)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1905 (new-word (if (atom replace) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1906 replace |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1907 (car replace))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1908 (cursor-location (+ (- (length word) (- end start)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1909 cursor-location))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1910 (if (not (equal new-word (car poss))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1911 (progn |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1912 (delete-region start end) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1913 (goto-char start) |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1914 (funcall flyspell-insert-function new-word) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1915 (if flyspell-abbrev-p |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1916 (flyspell-define-abbrev word new-word)))) |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1917 (flyspell-ajust-cursor-point save cursor-location old-max))))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1918 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1919 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1920 ;* flyspell-ajust-cursor-point ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1921 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1922 (defun flyspell-ajust-cursor-point (save cursor-location old-max) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1923 (if (>= save cursor-location) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1924 (let ((new-pos (+ save (- (point-max) old-max)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1925 (goto-char (cond |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1926 ((< new-pos (point-min)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1927 (point-min)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1928 ((> new-pos (point-max)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1929 (point-max)) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1930 (t new-pos)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1931 (goto-char save))) |
| 22611 | 1932 |
| 1933 ;*---------------------------------------------------------------------*/ | |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1934 ;* flyspell-emacs-popup ... */ |
| 22611 | 1935 ;*---------------------------------------------------------------------*/ |
|
22844
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1936 (defun flyspell-emacs-popup (event poss word) |
|
1104a715c324
(flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
22648
diff
changeset
|
1937 "The Emacs popup menu." |
| 22611 | 1938 (if (not event) |
| 1939 (let* ((mouse-pos (mouse-position)) | |
| 1940 (mouse-pos (if (nth 1 mouse-pos) | |
| 1941 mouse-pos | |
| 1942 (set-mouse-position (car mouse-pos) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1943 (/ (frame-width) 2) 2) |
| 22611 | 1944 (unfocus-frame) |
| 1945 (mouse-position)))) | |
| 1946 (setq event (list (list (car (cdr mouse-pos)) | |
| 1947 (1+ (cdr (cdr mouse-pos)))) | |
| 1948 (car mouse-pos))))) | |
| 1949 (let* ((corrects (if flyspell-sort-corrections | |
| 1950 (sort (car (cdr (cdr poss))) 'string<) | |
| 1951 (car (cdr (cdr poss))))) | |
| 1952 (cor-menu (if (consp corrects) | |
| 1953 (mapcar (lambda (correct) | |
| 1954 (list correct correct)) | |
| 1955 corrects) | |
| 1956 '())) | |
| 1957 (affix (car (cdr (cdr (cdr poss))))) | |
| 1958 (base-menu (let ((save (if (consp affix) | |
| 1959 (list | |
| 1960 (list (concat "Save affix: " (car affix)) | |
| 1961 'save) | |
|
43064
aad0b1eb2142
(flyspell-issue-message-flag): New user option.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43016
diff
changeset
|
1962 '("Accept (session)" session) |
| 22611 | 1963 '("Accept (buffer)" buffer)) |
| 1964 '(("Save word" save) | |
| 1965 ("Accept (session)" session) | |
| 1966 ("Accept (buffer)" buffer))))) | |
| 1967 (if (consp cor-menu) | |
| 1968 (append cor-menu (cons "" save)) | |
| 1969 save))) | |
| 1970 (menu (cons "flyspell correction menu" base-menu))) | |
| 1971 (car (x-popup-menu event | |
| 1972 (list (format "%s [%s]" word (or ispell-local-dictionary | |
| 1973 ispell-dictionary)) | |
| 1974 menu))))) | |
| 1975 | |
| 1976 ;*---------------------------------------------------------------------*/ | |
|
22891
780c3ef895d7
(flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents:
22844
diff
changeset
|
1977 ;* flyspell-xemacs-popup ... */ |
| 22611 | 1978 ;*---------------------------------------------------------------------*/ |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1979 (defun flyspell-xemacs-popup (event poss word cursor-location start end save) |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
1980 "The XEmacs popup menu." |
| 22611 | 1981 (let* ((corrects (if flyspell-sort-corrections |
| 1982 (sort (car (cdr (cdr poss))) 'string<) | |
| 1983 (car (cdr (cdr poss))))) | |
| 1984 (cor-menu (if (consp corrects) | |
| 1985 (mapcar (lambda (correct) | |
| 1986 (vector correct | |
| 1987 (list 'flyspell-xemacs-correct | |
| 1988 correct | |
| 1989 (list 'quote poss) | |
| 1990 word | |
| 1991 cursor-location | |
| 1992 start | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1993 end |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
1994 save) |
| 22611 | 1995 t)) |
| 1996 corrects) | |
| 1997 '())) | |
| 1998 (affix (car (cdr (cdr (cdr poss))))) | |
| 1999 (menu (let ((save (if (consp affix) | |
| 2000 (vector | |
| 2001 (concat "Save affix: " (car affix)) | |
| 2002 (list 'flyspell-xemacs-correct | |
| 2003 ''save | |
| 2004 (list 'quote poss) | |
| 2005 word | |
| 2006 cursor-location | |
| 2007 start | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2008 end |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2009 save) |
| 22611 | 2010 t) |
| 2011 (vector | |
| 2012 "Save word" | |
| 2013 (list 'flyspell-xemacs-correct | |
| 2014 ''save | |
| 2015 (list 'quote poss) | |
| 2016 word | |
| 2017 cursor-location | |
| 2018 start | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2019 end |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2020 save) |
| 22611 | 2021 t))) |
| 2022 (session (vector "Accept (session)" | |
| 2023 (list 'flyspell-xemacs-correct | |
| 2024 ''session | |
| 2025 (list 'quote poss) | |
| 2026 word | |
| 2027 cursor-location | |
| 2028 start | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2029 end |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2030 save) |
| 22611 | 2031 t)) |
| 2032 (buffer (vector "Accept (buffer)" | |
| 2033 (list 'flyspell-xemacs-correct | |
| 2034 ''buffer | |
| 2035 (list 'quote poss) | |
| 2036 word | |
| 2037 cursor-location | |
| 2038 start | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2039 end |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2040 save) |
| 22611 | 2041 t))) |
| 2042 (if (consp cor-menu) | |
| 2043 (append cor-menu (list "-" save session buffer)) | |
| 2044 (list save session buffer))))) | |
| 2045 (popup-menu (cons (format "%s [%s]" word (or ispell-local-dictionary | |
| 2046 ispell-dictionary)) | |
| 2047 menu)))) | |
| 2048 | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2049 ;*---------------------------------------------------------------------*/ |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
2050 ;* Some example functions for real autocorrecting */ |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2051 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2052 (defun flyspell-maybe-correct-transposition (beg end poss) |
| 37008 | 2053 "Check replacements for transposed characters. |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2054 |
| 37008 | 2055 If the text between BEG and END is equal to a correction suggested by |
| 2056 Ispell, after transposing two adjacent characters, correct the text, | |
| 2057 and return t. | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2058 |
| 37008 | 2059 The third arg POSS is either the symbol 'doublon' or a list of |
| 2060 possible corrections as returned by 'ispell-parse-output'. | |
| 22611 | 2061 |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2062 This function is meant to be added to 'flyspell-incorrect-hook'." |
|
35617
da38a879b6fe
Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents:
35338
diff
changeset
|
2063 (when (consp poss) |
| 37008 | 2064 (let ((temp-buffer (get-buffer-create " *flyspell-temp*")) |
| 2065 found) | |
| 2066 (save-excursion | |
| 2067 (copy-to-buffer temp-buffer beg end) | |
| 2068 (set-buffer temp-buffer) | |
| 2069 (goto-char (1+ (point-min))) | |
| 2070 (while (and (not (eobp)) (not found)) | |
| 2071 (transpose-chars 1) | |
| 2072 (if (member (buffer-string) (nth 2 poss)) | |
| 2073 (setq found (point)) | |
| 2074 (transpose-chars -1) | |
| 2075 (forward-char)))) | |
| 2076 (when found | |
|
37006
2fa95954d8de
Backed out changes made by John Wiegley 2000-10-28.
Gerd Moellmann <gerd@gnu.org>
parents:
36569
diff
changeset
|
2077 (save-excursion |
| 37008 | 2078 (goto-char (+ beg found -1)) |
| 2079 (transpose-chars -1) | |
| 2080 t))))) | |
| 2081 | |
| 2082 (defun flyspell-maybe-correct-doubling (beg end poss) | |
| 2083 "Check replacements for doubled characters. | |
| 2084 | |
| 2085 If the text between BEG and END is equal to a correction suggested by | |
| 2086 Ispell, after removing a pair of doubled characters, correct the text, | |
| 2087 and return t. | |
| 2088 | |
| 2089 The third arg POSS is either the symbol 'doublon' or a list of | |
| 2090 possible corrections as returned by 'ispell-parse-output'. | |
| 2091 | |
| 2092 This function is meant to be added to 'flyspell-incorrect-hook'." | |
| 2093 (when (consp poss) | |
| 2094 (let ((temp-buffer (get-buffer-create " *flyspell-temp*")) | |
| 2095 found) | |
| 2096 (save-excursion | |
| 2097 (copy-to-buffer temp-buffer beg end) | |
| 2098 (set-buffer temp-buffer) | |
| 2099 (goto-char (1+ (point-min))) | |
| 2100 (while (and (not (eobp)) (not found)) | |
| 2101 (when (char-equal (char-after) (char-before)) | |
| 2102 (delete-char 1) | |
| 2103 (if (member (buffer-string) (nth 2 poss)) | |
| 2104 (setq found (point)) | |
| 2105 (insert-char (char-before) 1))) | |
| 2106 (forward-char))) | |
| 2107 (when found | |
| 2108 (save-excursion | |
| 2109 (goto-char (+ beg found -1)) | |
| 2110 (delete-char 1) | |
| 2111 t))))) | |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2112 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2113 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2114 ;* flyspell-already-abbrevp ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2115 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2116 (defun flyspell-already-abbrevp (table word) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2117 (let ((sym (abbrev-symbol word table))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2118 (and sym (symbolp sym)))) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2119 |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2120 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2121 ;* flyspell-change-abbrev ... */ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2122 ;*---------------------------------------------------------------------*/ |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2123 (defun flyspell-change-abbrev (table old new) |
|
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2124 (set (abbrev-symbol old table) new)) |
|
43016
ee78d55b45f4
Minor formatting fixes in preparation of merging new version.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42684
diff
changeset
|
2125 |
|
30428
b7b96f09059d
Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents:
27787
diff
changeset
|
2126 (provide 'flyspell) |
|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Jan?k <Pavel@Janik.cz>
parents:
37008
diff
changeset
|
2127 |
| 52401 | 2128 ;;; arch-tag: 05d915b9-e9cf-44fb-9137-fc28f5eaab2a |
| 22611 | 2129 ;;; flyspell.el ends here |
