annotate lisp/textmodes/flyspell.el @ 59472:1e81e65f3201

(Info-history-forward): New variable. (Info-select-node): Reset Info-history-forward to nil. (Info-last): Turn into defalias. (Info-history-back): Rename from Info-last. Add current node to Info-history-forward. (Info-history-forward): New fun. (Info-mode-map): Replace Info-last by Info-history-back. Bind Info-history-forward to "r". (Info-mode-menu): Replace Info-last by Info-history-back. Fix menu item text. Add menu item for Info-history-forward. (info-tool-bar-map): Replace Info-last by Info-history-back. Replace its icon "undo" by "back_arrow". Add icon "fwd_arrow" for Info-history-forward. (Info-mode): Replace Info-last by Info-history-back in docstring. Add local variable Info-history-forward. (Info-goto-emacs-command-node): Replace Info-last by Info-history-back.
author Juri Linkov <juri@jurta.org>
date Tue, 11 Jan 2005 21:57:16 +0000
parents b838f6a6cb4d
children e55f542ec767 b637c617432f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 37008
diff changeset
1 ;;; flyspell.el --- on-the-fly spell checker
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2
58263
b838f6a6cb4d (flyspell-mouse-map): Pop the menu
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58001
diff changeset
3 ;; Copyright (C) 1998, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4
56522
6ed4179ba08b Update author email address.
Richard M. Stallman <rms@gnu.org>
parents: 55731
diff changeset
5 ;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr>
55731
856dacc3ac48 Maintained by FSF.
Richard M. Stallman <rms@gnu.org>
parents: 55432
diff changeset
6 ;; Maintainer: FSF
22612
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
7 ;; Keywords: convenience
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
8
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 37008
diff changeset
9 ;; This file is part of GNU Emacs.
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 ;; any later version.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
24 ;; Boston, MA 02111-1307, USA.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
26 ;;; Commentary:
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27 ;;
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
28 ;; 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
29 ;; checking.
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
30 ;;
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
31 ;; 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
32 ;; 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
33 ;;
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
34 ;; 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
35 ;; M-x flyspell-prog-mode.
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
36 ;; 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
37 ;;
22844
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
38 ;; 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
39 ;; 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
40 ;;
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
41 ;; Some user variables control the behavior of flyspell. They are
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
42 ;; those defined under the `User variables' comment.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
43
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44 ;;; Code:
43016
ee78d55b45f4 Minor formatting fixes in preparation of merging new version.
Pavel Janík <Pavel@Janik.cz>
parents: 42684
diff changeset
45
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
46 (require 'ispell)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
47
22891
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
48 ;*---------------------------------------------------------------------*/
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
49 ;* Group ... */
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
50 ;*---------------------------------------------------------------------*/
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
51 (defgroup flyspell nil
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
52 "Spell checking on the fly."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
53 :tag "FlySpell"
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
54 :prefix "flyspell-"
43383
d21a74d23497 2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 43148
diff changeset
55 :group 'ispell
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
56 :group 'processes)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
57
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
58 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
59 ;* User configuration ... */
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
60 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
61 (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
62 "*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
63 Non-nil means use highlight, nil means use minibuffer messages."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
64 :group 'flyspell
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
65 :type 'boolean)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
66
22844
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
67 (defcustom flyspell-mark-duplications-flag t
22962
f4509374e88e (flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents: 22946
diff changeset
68 "*Non-nil means Flyspell reports a repeated word as an error."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
69 :group 'flyspell
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
70 :type 'boolean)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
71
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
72 (defcustom flyspell-sort-corrections nil
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
73 "*Non-nil means, sort the corrections alphabetically before popping them."
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
74 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
75 :version "21.1"
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
76 :type 'boolean)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
77
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
78 (defcustom flyspell-duplicate-distance -1
22962
f4509374e88e (flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents: 22946
diff changeset
79 "*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
80 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
81 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
82 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
83 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
84 -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
85 0 means do not search for duplicate unrecognized spellings."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
86 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
87 :version "21.1"
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
88 :type 'number)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
89
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
90 (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
91 "*The number of seconds to wait before checking, after a \"delayed\" command."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
92 :group 'flyspell
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
93 :type 'number)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
94
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
95 (defcustom flyspell-persistent-highlight t
22946
cfde96067373 (flyspell-persistent-highlight): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 22891
diff changeset
96 "*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
97 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
98 is highlighted."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
99 :group 'flyspell
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
100 :type 'boolean)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
101
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
102 (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
103 "*Non-nil means highlight incorrect words even if a property exists for this word."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
104 :group 'flyspell
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
105 :type 'boolean)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
106
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
107 (defcustom flyspell-default-delayed-commands
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
108 '(self-insert-command
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
109 delete-backward-char
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
110 backward-or-forward-delete-char
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
111 delete-char
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
112 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
113 "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
114 See `flyspell-delayed-commands'."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
115 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
116 :version "21.1"
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
117 :type '(repeat (symbol)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
118
22844
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
119 (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
120 "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
121 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
122 whose length is specified by `flyspell-delay'."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
123 :group 'flyspell
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
124 :type '(repeat (symbol)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
125
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
126 (defcustom flyspell-default-deplacement-commands
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
127 '(next-line
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
128 previous-line
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
129 scroll-up
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
130 scroll-down)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
131 "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
132 See `flyspell-deplacement-commands'."
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
133 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
134 :version "21.1"
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
135 :type '(repeat (symbol)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
136
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
137 (defcustom flyspell-deplacement-commands nil
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
138 "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
139 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
140 command was not the very same command."
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
141 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
142 :version "21.1"
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
143 :type '(repeat (symbol)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
144
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
145 (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
146 "*Non-nil means that Flyspell should display a welcome message when started."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
147 :group 'flyspell
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
148 :type 'boolean)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
149
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
150 (defcustom flyspell-issue-message-flag t
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
151 "*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
152 :group 'flyspell
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
153 :type 'boolean)
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
154
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
155 (defcustom flyspell-incorrect-hook nil
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
156 "*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
157 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
158 of the incorrect region. The third is either the symbol 'doublon' or the list
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
159 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
160
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
161 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
162 incorrect."
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
163 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
164 :version "21.1"
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
165 :type 'hook)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
166
40933
29830f44be6a (flyspell-default-dictionary): Allow nil as value, and make nil the default.
Richard M. Stallman <rms@gnu.org>
parents: 40898
diff changeset
167 (defcustom flyspell-default-dictionary nil
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
168 "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
169 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
170 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
171 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
172 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
173 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
174 Ispell's ultimate default dictionary."
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
175 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
176 :version "21.1"
40942
52f0b9d1d57b (flyspell-default-dictionary): Fix previous change.
Pavel Janík <Pavel@Janik.cz>
parents: 40938
diff changeset
177 :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
178
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
179 (defcustom flyspell-tex-command-regexp
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
180 "\\(\\(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
181 "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
182 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
183 :version "21.1"
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
184 :type 'string)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
185
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
186 (defcustom flyspell-check-tex-math-command nil
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
187 "*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
188 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
189 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
190 http://strw.leidenuniv.nl/~dominik/Tools"
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
191 :group 'flyspell
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
192 :type 'boolean)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
193
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
194 (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
195 '("francais" "deutsch8" "norsk")
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
196 "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
197 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
198 :version "21.1"
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
199 :type '(repeat (string)))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
200
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
201 (defcustom flyspell-abbrev-p
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
202 t
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
203 "*If true, add correction to abbreviation table."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
204 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
205 :version "21.1"
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
206 :type 'boolean)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
207
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
208 (defcustom flyspell-use-global-abbrev-table-p
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
209 nil
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
210 "*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
211 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
212 :version "21.1"
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
213 :type 'boolean)
43016
ee78d55b45f4 Minor formatting fixes in preparation of merging new version.
Pavel Janík <Pavel@Janik.cz>
parents: 42684
diff changeset
214
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
215 ;;;###autoload
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
216 (defcustom flyspell-mode-line-string " Fly"
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
217 "*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
218 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
219 :group 'flyspell
42622
2c67c90f9b6d (flyspell-mode-line-string): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents: 42456
diff changeset
220 :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
221
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
222 (defcustom flyspell-large-region 1000
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
223 "*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
224 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
225 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
226 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
227 speed."
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
228 :group 'flyspell
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
229 :version "21.1"
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
230 :type 'number)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
231
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
232 (defcustom flyspell-insert-function (function insert)
43148
b3cf1a561428 (flyspell-insert-function): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 43064
diff changeset
233 "*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
234 :group 'flyspell
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
235 :type 'function)
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
236
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
237 (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
238 "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
239 :group 'flyspell
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
240 :type '(choice string (const nil)))
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
241
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
242 (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
243 "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
244 :group 'flyspell
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
245 :type '(choice string (const nil)))
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
246
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
247 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
248 ;* Mode specific options */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
249 ;* ------------------------------------------------------------- */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
250 ;* Mode specific options enable users to disable flyspell on */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
251 ;* certain word depending of the emacs mode. For instance, when */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
252 ;* using flyspell with mail-mode add the following expression */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
253 ;* in your .emacs file: */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
254 ;* (add-hook 'mail-mode */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
255 ;* '(lambda () (setq flyspell-generic-check-word-p */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
256 ;* 'mail-mode-flyspell-verify))) */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
257 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
258 (defvar flyspell-generic-check-word-p nil
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
259 "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
260 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
261 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
262 property of the major mode name.")
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
263 (make-variable-buffer-local 'flyspell-generic-check-word-p)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
264
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
265 ;*--- mail mode -------------------------------------------------------*/
22844
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
266 (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
267 (put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
268 (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
269 "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
270 (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
271 ;; 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
272 ;; 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
273 (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
274 (in-signature (save-excursion
6043184119bc (mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents: 33787
diff changeset
275 (re-search-backward message-signature-separator nil t))))
6043184119bc (mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents: 33787
diff changeset
276 (cond (in-headers
35338
3ee28dccba1d (mail-mode-flyspell-verify): Check in
Gerd Moellmann <gerd@gnu.org>
parents: 34925
diff changeset
277 (and (save-excursion (beginning-of-line)
3ee28dccba1d (mail-mode-flyspell-verify): Check in
Gerd Moellmann <gerd@gnu.org>
parents: 34925
diff changeset
278 (looking-at "^Subject:"))
3ee28dccba1d (mail-mode-flyspell-verify): Check in
Gerd Moellmann <gerd@gnu.org>
parents: 34925
diff changeset
279 (> (point) (match-end 0))))
34925
6043184119bc (mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents: 33787
diff changeset
280 (in-signature
6043184119bc (mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents: 33787
diff changeset
281 nil)
6043184119bc (mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents: 33787
diff changeset
282 (t
6043184119bc (mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents: 33787
diff changeset
283 (save-excursion
6043184119bc (mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents: 33787
diff changeset
284 (beginning-of-line)
6043184119bc (mail-mode-flyspell-verify): Spell-check
Gerd Moellmann <gerd@gnu.org>
parents: 33787
diff changeset
285 (not (looking-at "[>}|]\\To:")))))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
286
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
287 ;*--- texinfo mode ----------------------------------------------------*/
22844
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
288 (put 'texinfo-mode 'flyspell-mode-predicate 'texinfo-mode-flyspell-verify)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
289 (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
290 "This function is used for `flyspell-generic-check-word-p' in Texinfo mode."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
291 (save-excursion
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
292 (forward-word -1)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
293 (not (looking-at "@"))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
294
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
295 ;*--- tex mode --------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
296 (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
297 (defun tex-mode-flyspell-verify ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
298 "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
299 (and
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
300 (not (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
301 (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
302 (not (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
303 (let ((this (point-marker))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
304 (e (progn (end-of-line) (point-marker))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
305 (beginning-of-line)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
306 (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
307 (and (>= this (match-beginning 0))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
308 (<= this (match-end 0)) )))))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
309
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
310 ;*--- sgml mode -------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
311 (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
312 (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
313
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
314 (defun sgml-mode-flyspell-verify ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
315 "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
316 (not (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
317 (let ((this (point-marker))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
318 (s (progn (beginning-of-line) (point-marker)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
319 (e (progn (end-of-line) (point-marker))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
320 (or (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
321 (goto-char this)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
322 (and (re-search-forward "[^<]*>" e t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
323 (= (match-beginning 0) this)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
324 (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
325 (goto-char this)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
326 (and (re-search-backward "<[^>]*" s t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
327 (= (match-end 0) this)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
328 (and (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
329 (goto-char this)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
330 (and (re-search-forward "[^&]*;" e t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
331 (= (match-beginning 0) this)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
332 (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
333 (goto-char this)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
334 (and (re-search-backward "&[^;]*" s t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
335 (= (match-end 0) this)))))))))
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 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
338 ;* Programming mode */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
339 ;*---------------------------------------------------------------------*/
33787
d16b29f737a7 (flyspell-prog-text-faces): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33426
diff changeset
340 (defvar flyspell-prog-text-faces
d16b29f737a7 (flyspell-prog-text-faces): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33426
diff changeset
341 '(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
342 "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
343
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
344 (defun flyspell-generic-progmode-verify ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
345 "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
346 (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
347 (memq f flyspell-prog-text-faces)))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
348
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
349 ;;;###autoload
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
350 (defun flyspell-prog-mode ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
351 "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
352 (interactive)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
353 (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
354 (flyspell-mode 1))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
355
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
356 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
357 ;* Overlay compatibility */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
358 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
359 (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
360 (autoload 'overlayp "overlay" "Overlay compatibility kit." t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
361 (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
362 (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
363 (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
364 (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
365 (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
366 (autoload 'previous-overlay-change "overlay" "Overlay compatibility kit." t)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
367
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
368 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
369 ;* Which emacs are we currently running */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
370 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
371 (defvar flyspell-emacs
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
372 (cond
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
373 ((string-match "XEmacs" emacs-version)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
374 'xemacs)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
375 (t
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
376 'emacs))
22891
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
377 "The type of Emacs we are currently running.")
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
378
23943
7555c77bc4f0 If local-maps work, don't put
Richard M. Stallman <rms@gnu.org>
parents: 23788
diff changeset
379 (defvar flyspell-use-local-map
7555c77bc4f0 If local-maps work, don't put
Richard M. Stallman <rms@gnu.org>
parents: 23788
diff changeset
380 (or (eq flyspell-emacs 'xemacs)
7555c77bc4f0 If local-maps work, don't put
Richard M. Stallman <rms@gnu.org>
parents: 23788
diff changeset
381 (not (string< emacs-version "20"))))
7555c77bc4f0 If local-maps work, don't put
Richard M. Stallman <rms@gnu.org>
parents: 23788
diff changeset
382
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
383 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
384 ;* The minor mode declaration. */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
385 ;*---------------------------------------------------------------------*/
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
386 (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
387
43444
e3bdc12b3e47 (flyspell-mode): Autoload the variable since it is used in the menu bar.
Sam Steingold <sds@gnu.org>
parents: 43383
diff changeset
388 ;;;###autoload
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
389 (defvar flyspell-mode nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
390 (make-variable-buffer-local 'flyspell-mode)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
391
27787
d40d47971e6b (flyspell-mouse-map): Change definition
Dave Love <fx@gnu.org>
parents: 24943
diff changeset
392 (defvar flyspell-mouse-map
d40d47971e6b (flyspell-mouse-map): Change definition
Dave Love <fx@gnu.org>
parents: 24943
diff changeset
393 (let ((map (make-sparse-keymap)))
58263
b838f6a6cb4d (flyspell-mouse-map): Pop the menu
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58001
diff changeset
394 (define-key map (if (featurep 'xemacs) [button2] [down-mouse-2])
b838f6a6cb4d (flyspell-mouse-map): Pop the menu
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58001
diff changeset
395 #'flyspell-correct-word)
b838f6a6cb4d (flyspell-mouse-map): Pop the menu
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58001
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 map))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
398
42346
76e044b68878 (flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents: 40942
diff changeset
399 ;;;###autoload
76e044b68878 (flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents: 40942
diff changeset
400 (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
401
76e044b68878 (flyspell-mode-map): New keymap, defined as before 2001-11-09.
Richard M. Stallman <rms@gnu.org>
parents: 40942
diff changeset
402 ;; 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
403 (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
404 (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
405 (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
406 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 (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
408
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
409 ;; 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
410 (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
411
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
412 ;; dash character machinery
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
413 (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
414 "*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
415 (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
416 (defvar flyspell-dash-dictionary nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
417 (make-variable-buffer-local 'flyspell-dash-dictionary)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
418 (defvar flyspell-dash-local-dictionary nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
419 (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
420
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
421 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
422 ;* Highlighting */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
423 ;*---------------------------------------------------------------------*/
22844
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
424 (defface flyspell-incorrect-face
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
425 (if (eq flyspell-emacs 'xemacs)
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
426 '((((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
427 (t (:bold t)))
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
428 '((((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
429 (t (:weight bold))))
22962
f4509374e88e (flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents: 22946
diff changeset
430 "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
431 :group 'flyspell)
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
432
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
433 (defface flyspell-duplicate-face
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
434 (if (eq flyspell-emacs 'xemacs)
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
435 '((((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
436 (t (:bold t)))
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
437 '((((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
438 (t (:weight bold))))
22962
f4509374e88e (flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents: 22946
diff changeset
439 "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
440 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
441 :group 'flyspell)
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
442
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
443 (defvar flyspell-overlay nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
444
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
445 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
446 ;* flyspell-mode ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
447 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
448 ;;;###autoload
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
449 (defun flyspell-mode (&optional arg)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
450 "Minor mode performing on-the-fly spelling checking.
57605
6738a2db2167 (flyspell-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56767
diff changeset
451 This spawns a single Ispell process and checks each word.
22844
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
452 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
453 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
454 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
455
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
456 Bindings:
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
457 \\[ispell-word]: correct words (using Ispell).
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
458 \\[flyspell-auto-correct-word]: automatically correct word.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
459 \\[flyspell-correct-word] (or mouse-2): popup correct words.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
460
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
461 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
462 This runs `flyspell-mode-hook' after flyspell is entered.
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
463
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
464 Remark:
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
465 `flyspell-mode' uses `ispell-mode'. Thus all Ispell options are
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
466 valid. For instance, a personal dictionary can be used by
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
467 invoking `ispell-change-dictionary'.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
468
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
469 Consider using the `ispell-parser' to check your text. For instance
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
470 consider adding:
22844
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
471 \(add-hook 'tex-mode-hook (function (lambda () (setq ispell-parser 'tex))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
472 in your .emacs file.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
473
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
474 \\[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
475 \\[flyspell-buffer] checks the whole buffer."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
476 (interactive "P")
23179
72461ea3cfc8 (flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents: 22963
diff changeset
477 (let ((old-flyspell-mode flyspell-mode))
72461ea3cfc8 (flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents: 22963
diff changeset
478 ;; Mark the mode as on or off.
72461ea3cfc8 (flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents: 22963
diff changeset
479 (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
480 (<= (prefix-numeric-value arg) 0))))
72461ea3cfc8 (flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents: 22963
diff changeset
481 ;; Do the real work.
72461ea3cfc8 (flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents: 22963
diff changeset
482 (unless (eq flyspell-mode old-flyspell-mode)
72461ea3cfc8 (flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents: 22963
diff changeset
483 (if flyspell-mode
72461ea3cfc8 (flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents: 22963
diff changeset
484 (flyspell-mode-on)
72461ea3cfc8 (flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents: 22963
diff changeset
485 (flyspell-mode-off))
72461ea3cfc8 (flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents: 22963
diff changeset
486 ;; Force modeline redisplay.
72461ea3cfc8 (flyspell-mode): Do nothing if mode
Karl Heuer <kwzh@gnu.org>
parents: 22963
diff changeset
487 (set-buffer-modified-p (buffer-modified-p)))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
488
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
489 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
490 ;* Autoloading */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
491 ;*---------------------------------------------------------------------*/
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
492 ;;;###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
493 (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
494 '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
495 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
496 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
497 'flyspell-mode)
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
498
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
499 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
500 ;* flyspell-buffers ... */
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 ;* For remembering buffers running flyspell */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
503 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
504 (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
505
30428
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 ;* flyspell-minibuffer-p ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
508 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
509 (defun flyspell-minibuffer-p (buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
510 "Is BUFFER a minibuffer?"
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
511 (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
512 (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
513
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
514 ;*---------------------------------------------------------------------*/
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
515 ;* flyspell-version ... */
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
516 ;*---------------------------------------------------------------------*/
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
517 ;;;###autoload
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
518 (defun flyspell-version ()
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
519 "The flyspell version"
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
520 (interactive)
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
521 "1.6h")
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
522
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
523 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
524 ;* flyspell-accept-buffer-local-defs ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
525 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
526 (defun flyspell-accept-buffer-local-defs ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
527 (ispell-accept-buffer-local-defs)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
528 (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
529 (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
530 ;; the dictionary has changed
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
531 (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
532 (setq flyspell-dash-dictionary ispell-dictionary)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
533 (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
534 (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
535 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
536 (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
537 (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
538
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
539 ;*---------------------------------------------------------------------*/
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
540 ;* flyspell-mode-on ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
541 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
542 (defun flyspell-mode-on ()
23234
b0e173658e2e (flyspell-mode-on): Make the
Karl Heuer <kwzh@gnu.org>
parents: 23233
diff changeset
543 "Turn Flyspell mode on. Do not use this; use `flyspell-mode' instead."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
544 (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
545 ;; local dictionaries setup
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
546 (ispell-change-dictionary
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
547 (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
548 ;; 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
549 ;; 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
550 ;; be forgotten!
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
551 (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
552 ;; we put the `flyspell-delayed' property on some commands
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
553 (flyspell-delay-commands)
45184
fe852d8d5495 (make-flyspell-overlay): Add help text to flyspell overlays.
Pavel Janík <Pavel@Janik.cz>
parents: 43444
diff changeset
554 ;; 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
555 (flyspell-deplacement-commands)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
556 ;; 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
557 (add-hook 'post-command-hook (function flyspell-post-command-hook) t t)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
558 ;; 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
559 (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
560 ;; 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
561 (make-local-variable 'after-change-functions)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
562 (setq after-change-functions
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
563 (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
564 ;; 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
565 (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
566 (if mode-predicate
1104a715c324 (flyspell-emacs-popup): Renamed from flyspell-gnuemacs-popup. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22648
diff changeset
567 (setq flyspell-generic-check-word-p mode-predicate)))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
568 ;; the welcome message
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
569 (if (and flyspell-issue-message-flag
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
570 flyspell-issue-welcome-flag
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
571 (interactive-p))
22891
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
572 (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
573 nil 'non-ascii)))
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
574 (message
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
575 (if binding
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
576 (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
577 (key-description binding))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
578 "Welcome to flyspell. Use Mouse-2 to correct words."))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
579 ;; we end with the flyspell hooks
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
580 (run-hooks 'flyspell-mode-hook))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
581
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
582 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
583 ;* flyspell-delay-commands ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
584 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
585 (defun flyspell-delay-commands ()
23234
b0e173658e2e (flyspell-mode-on): Make the
Karl Heuer <kwzh@gnu.org>
parents: 23233
diff changeset
586 "Install the standard set of Flyspell delayed commands."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
587 (mapcar 'flyspell-delay-command flyspell-default-delayed-commands)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
588 (mapcar 'flyspell-delay-command flyspell-delayed-commands))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
589
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
590 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
591 ;* flyspell-delay-command ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
592 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
593 (defun flyspell-delay-command (command)
23234
b0e173658e2e (flyspell-mode-on): Make the
Karl Heuer <kwzh@gnu.org>
parents: 23233
diff changeset
594 "Set COMMAND to be delayed, for Flyspell.
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
595 When flyspell `post-command-hook' is invoked because a delayed command
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
596 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
597 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
598 (interactive "SDelay Flyspell after Command: ")
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
599 (put command 'flyspell-delayed t))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
600
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
601 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
602 ;* flyspell-deplacement-commands ... */
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
603 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
604 (defun flyspell-deplacement-commands ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
605 "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
606 (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
607 (mapcar 'flyspell-deplacement-command flyspell-deplacement-commands))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
608
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
609 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
610 ;* flyspell-deplacement-command ... */
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
611 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
612 (defun flyspell-deplacement-command (command)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
613 "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
614 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
615 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
616 not the very same deplacement command."
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
617 (interactive "SDeplacement Flyspell after Command: ")
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
618 (put command 'flyspell-deplacement t))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
619
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
620 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
621 ;* flyspell-word-cache ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
622 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
623 (defvar flyspell-word-cache-start nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
624 (defvar flyspell-word-cache-end nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
625 (defvar flyspell-word-cache-word nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
626 (make-variable-buffer-local 'flyspell-word-cache-start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
627 (make-variable-buffer-local 'flyspell-word-cache-end)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
628 (make-variable-buffer-local 'flyspell-word-cache-word)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
629
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
630 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
631 ;* The flyspell pre-hook, store the current position. In the */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
632 ;* post command hook, we will check, if the word at this position */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
633 ;* has to be spell checked. */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
634 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
635 (defvar flyspell-pre-buffer nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
636 (defvar flyspell-pre-point nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
637 (defvar flyspell-pre-column nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
638 (defvar flyspell-pre-pre-buffer nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
639 (defvar flyspell-pre-pre-point nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
640
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
641 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
642 ;* flyspell-previous-command ... */
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 (defvar flyspell-previous-command nil
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
645 "The last interactive command checked by Flyspell.")
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
646
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
647 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
648 ;* flyspell-pre-command-hook ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
649 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
650 (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
651 "Save the current buffer and point for Flyspell's post-command hook."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
652 (interactive)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
653 (setq flyspell-pre-buffer (current-buffer))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
654 (setq flyspell-pre-point (point))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
655 (setq flyspell-pre-column (current-column)))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
656
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
657 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
658 ;* flyspell-mode-off ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
659 ;*---------------------------------------------------------------------*/
23234
b0e173658e2e (flyspell-mode-on): Make the
Karl Heuer <kwzh@gnu.org>
parents: 23233
diff changeset
660 ;;;###autoload
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
661 (defun flyspell-mode-off ()
23234
b0e173658e2e (flyspell-mode-on): Make the
Karl Heuer <kwzh@gnu.org>
parents: 23233
diff changeset
662 "Turn Flyspell mode off."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
663 ;; we remove the hooks
22962
f4509374e88e (flyspell-command-hook): Option deleted.
Richard M. Stallman <rms@gnu.org>
parents: 22946
diff changeset
664 (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
665 (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
666 (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
667 after-change-functions))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
668 ;; we remove all the flyspell hilightings
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
669 (flyspell-delete-all-overlays)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
670 ;; we have to erase pre cache variables
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
671 (setq flyspell-pre-buffer nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
672 (setq flyspell-pre-point nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
673 ;; we mark the mode as killed
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
674 (setq flyspell-mode nil))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
675
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
676 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
677 ;* flyspell-check-pre-word-p ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
678 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
679 (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
680 "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
681 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
682 before the current command."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
683 (cond
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
684 ((or (not (numberp flyspell-pre-point))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
685 (not (bufferp flyspell-pre-buffer))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
686 (not (buffer-live-p flyspell-pre-buffer)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
687 nil)
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
688 ((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
689 (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
690 nil)
22891
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
691 ((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
692 (eq (char-syntax (char-after flyspell-pre-point)) ?w))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
693 (= flyspell-pre-point (point))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
694 (= flyspell-pre-point (+ (point) 1)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
695 nil)
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
696 ((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
697 (not executing-kbd-macro)
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
698 (or (get this-command 'flyspell-delayed)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
699 (and (get this-command 'flyspell-deplacement)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
700 (eq flyspell-previous-command this-command)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
701 (or (= (current-column) 0)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
702 (= (current-column) flyspell-pre-column)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
703 (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
704 nil)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
705 ((not (eq (current-buffer) flyspell-pre-buffer))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
706 t)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
707 ((not (and (numberp flyspell-word-cache-start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
708 (numberp flyspell-word-cache-end)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
709 t)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
710 (t
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
711 (or (< flyspell-pre-point flyspell-word-cache-start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
712 (> 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
713
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
714 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
715 ;* 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
716 ;* 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
717 ;* position has to be spell checked. */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
718 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
719 (defvar flyspell-changes nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
720
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 ;* flyspell-after-change-function ... */
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 (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
725 "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
726 (interactive)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
727 (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
728
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
729 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
730 ;* flyspell-check-changed-word-p ... */
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 (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
733 "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
734 The answer depends of several criteria.
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
735 Mostly we check word delimiters."
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
736 (cond
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
737 ((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
738 t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
739 ((not (numberp flyspell-pre-point))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
740 t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
741 ((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
742 nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
743 ((let ((pos (point)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
744 (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
745 nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
746 (t
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
747 t)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
748
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
749 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
750 ;* flyspell-check-word-p ... */
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 (defun flyspell-check-word-p ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
753 "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
754 The answer depends of several criteria.
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
755 Mostly we check word delimiters."
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
756 (cond
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
757 ((<= (- (point-max) 1) (point-min))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
758 ;; the buffer is not filled enough
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
759 nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
760 ((and (and (> (current-column) 0)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
761 (not (eq (current-column) flyspell-pre-column)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
762 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
763 (backward-char 1)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
764 (and (looking-at (flyspell-get-not-casechars))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
765 (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
766 (not (looking-at "\\-"))))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
767 ;; 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
768 t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
769 ((symbolp this-command)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
770 (cond
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
771 ((get this-command 'flyspell-deplacement)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
772 (not (eq flyspell-previous-command this-command)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
773 ((get this-command 'flyspell-delayed)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
774 ;; the current command is not delayed, that
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
775 ;; 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
776 (if (fboundp 'about-xemacs)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
777 (sit-for flyspell-delay nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
778 (sit-for flyspell-delay 0 nil)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
779 (t t)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
780 (t t)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
781
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
782 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
783 ;* flyspell-debug-signal-no-check ... */
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 (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
786 (setq debug-on-error t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
787 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
788 (let ((buffer (get-buffer-create "*flyspell-debug*")))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
789 (set-buffer buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
790 (erase-buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
791 (insert "NO-CHECK:\n")
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
792 (insert (format " %S : %S\n" msg obj)))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
793
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
794 ;*---------------------------------------------------------------------*/
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
795 ;* flyspell-debug-signal-pre-word-checked ... */
30428
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 (defun flyspell-debug-signal-pre-word-checked ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
798 (setq debug-on-error t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
799 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
800 (let ((buffer (get-buffer-create "*flyspell-debug*")))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
801 (set-buffer buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
802 (insert "PRE-WORD:\n")
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
803 (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
804 (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
805 (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
806 (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
807 (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
808
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
809 ;*---------------------------------------------------------------------*/
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
810 ;* flyspell-debug-signal-word-checked ... */
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
811 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
812 (defun flyspell-debug-signal-word-checked ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
813 (setq debug-on-error t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
814 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
815 (let ((oldbuf (current-buffer))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
816 (buffer (get-buffer-create "*flyspell-debug*"))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
817 (point (point)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
818 (set-buffer buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
819 (insert "WORD:\n")
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
820 (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
821 (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
822 (get this-command 'flyspell-delayed))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
823 (insert (format " point : %S\n" point))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
824 (insert (format " prev-char : [%c] %S\n"
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
825 (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
826 (set-buffer oldbuf)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
827 (let ((c (if (> (point) (point-min))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
828 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
829 (backward-char 1)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
830 (char-after (point)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
831 ? )))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
832 (set-buffer buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
833 c))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
834 (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
835 (set-buffer oldbuf)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
836 (let ((c (if (> (point) (point-min))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
837 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
838 (backward-char 1)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
839 (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
840 (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
841 (not (looking-at "\\-"))) 2))))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
842 (set-buffer buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
843 c))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
844 (insert (format " because : %S\n"
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
845 (cond
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
846 ((not (and (symbolp this-command)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
847 (get this-command 'flyspell-delayed)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
848 ;; the current command is not delayed, that
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
849 ;; 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
850 'not-delayed)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
851 ((progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
852 (set-buffer oldbuf)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
853 (let ((c (if (> (point) (point-min))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
854 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
855 (backward-char 1)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
856 (and (looking-at (flyspell-get-not-casechars))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
857 (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
858 (not (looking-at "\\-"))))))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
859 (set-buffer buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
860 c))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
861 ;; 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
862 'separator)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
863 ((not (integerp flyspell-delay))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
864 ;; 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
865 'no-delay)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
866 (t
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
867 'sit-for))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
868 (goto-char (point-max)))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
869
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
870 ;*---------------------------------------------------------------------*/
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
871 ;* flyspell-debug-signal-changed-checked ... */
30428
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 (defun flyspell-debug-signal-changed-checked ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
874 (setq debug-on-error t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
875 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
876 (let ((buffer (get-buffer-create "*flyspell-debug*"))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
877 (point (point)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
878 (set-buffer buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
879 (insert "CHANGED WORD:\n")
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
880 (insert (format " point : %S\n" point))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
881 (goto-char (point-max)))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
882
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
883 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
884 ;* flyspell-post-command-hook ... */
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
885 ;* ------------------------------------------------------------- */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
886 ;* 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
887 ;* 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
888 ;* FLYSPELL-CHECK-WORD-P is true */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
889 ;* 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
890 ;* THIS-COMMAND is checked if: */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
891 ;* 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
892 ;* 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
893 ;* previous FLYSPELL-POST-COMMAND-HOOK */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
894 ;* 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
895 ;* previous word nor the current word */
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
896 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
897 (defun flyspell-post-command-hook ()
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
898 "The `post-command-hook' used by flyspell to check a word in-the-fly."
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
899 (interactive)
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
900 (let ((command this-command))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
901 (if (flyspell-check-pre-word-p)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
902 (save-excursion
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
903 '(flyspell-debug-signal-pre-word-checked)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
904 (set-buffer flyspell-pre-buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
905 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
906 (goto-char flyspell-pre-point)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
907 (flyspell-word))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
908 (if (flyspell-check-word-p)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
909 (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
910 '(flyspell-debug-signal-word-checked)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
911 (flyspell-word)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
912 ;; 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
913 ;; 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
914 ;; 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
915 ;; 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
916 ;; 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
917 ;; FLYSPELL-CHECK-PRE-WORD-P
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
918 (setq flyspell-pre-pre-buffer (current-buffer))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
919 (setq flyspell-pre-pre-point (point)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
920 (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
921 (setq flyspell-pre-pre-buffer nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
922 (setq flyspell-pre-pre-point nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
923 ;; 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
924 ;; we do not disable the ispell cache.
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
925 (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
926 (setq flyspell-word-cache-end -1))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
927 (while (consp flyspell-changes)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
928 (let ((start (car (car flyspell-changes)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
929 (stop (cdr (car flyspell-changes))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
930 (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
931 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
932 '(flyspell-debug-signal-changed-checked)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
933 (goto-char start)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
934 (flyspell-word)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
935 (setq flyspell-changes (cdr flyspell-changes))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
936 (setq flyspell-previous-command command)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
937
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
938 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
939 ;* flyspell-notify-misspell ... */
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 (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
942 (let ((replacements (if (stringp poss)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
943 poss
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
944 (if flyspell-sort-corrections
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
945 (sort (car (cdr (cdr poss))) 'string<)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
946 (car (cdr (cdr poss)))))))
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
947 (if flyspell-issue-message-flag
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
948 (message (format "mispelling `%s' %S" word replacements)))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
949
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
950 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
951 ;* flyspell-word ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
952 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
953 (defun flyspell-word (&optional following)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
954 "Spell check a word."
57936
10358c7d410b (flyspell-word): Don't alter FOLLOWING; set it only thru `interactive' spec.
Richard M. Stallman <rms@gnu.org>
parents: 57605
diff changeset
955 (interactive (list ispell-following-word))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
956 (save-excursion
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
957 ;; use the correct dictionary
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
958 (flyspell-accept-buffer-local-defs)
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
959 (let* ((cursor-location (point))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
960 (flyspell-word (flyspell-get-word following))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
961 start end poss word)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
962 (if (or (eq flyspell-word nil)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
963 (and (fboundp flyspell-generic-check-word-p)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
964 (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
965 '()
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
966 (progn
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
967 ;; destructure return flyspell-word info list.
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
968 (setq start (car (cdr flyspell-word))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
969 end (car (cdr (cdr flyspell-word)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
970 word (car flyspell-word))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
971 ;; before checking in the directory, we check for doublons.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
972 (cond
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
973 ((and (or (not (eq ispell-parser 'tex))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
974 (not (eq (char-after start) ?\\)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
975 flyspell-mark-duplications-flag
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
976 (save-excursion
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
977 (goto-char start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
978 (word-search-backward word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
979 (- start
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
980 (+ 1 (- end start)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
981 t)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
982 ;; yes, this is a doublon
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
983 (flyspell-highlight-incorrect-region start end 'doublon))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
984 ((and (eq flyspell-word-cache-start start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
985 (eq flyspell-word-cache-end end)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
986 (string-equal flyspell-word-cache-word word))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
987 ;; this word had been already checked, we skip
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
988 nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
989 ((and (eq ispell-parser 'tex)
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
990 (flyspell-tex-command-p flyspell-word))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
991 ;; this is a correct word (because a tex command)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
992 (flyspell-unhighlight-at start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
993 (if (> end start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
994 (flyspell-unhighlight-at (- end 1)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
995 t)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
996 (t
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
997 ;; we setup the cache
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
998 (setq flyspell-word-cache-start start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
999 (setq flyspell-word-cache-end end)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1000 (setq flyspell-word-cache-word word)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1001 ;; now check spelling of word.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1002 (process-send-string ispell-process "%\n")
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1003 ;; put in verbose mode
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1004 (process-send-string ispell-process
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1005 (concat "^" word "\n"))
22891
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
1006 ;; 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
1007 ;; when emacs is exited without query
56767
448c214b700f (flyspell-word): Use set-process-query-on-exit-flag.
Richard M. Stallman <rms@gnu.org>
parents: 56522
diff changeset
1008 (set-process-query-on-exit-flag ispell-process nil)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1009 ;; wait until ispell has processed word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1010 (while (progn
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1011 (accept-process-output ispell-process)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1012 (not (string= "" (car ispell-filter)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1013 ;; (process-send-string ispell-process "!\n")
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1014 ;; back to terse mode.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1015 (setq ispell-filter (cdr ispell-filter))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1016 (if (consp ispell-filter)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1017 (setq poss (ispell-parse-output (car ispell-filter))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1018 (cond ((eq poss t)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1019 ;; correct
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1020 (flyspell-unhighlight-at start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1021 (if (> end start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1022 (flyspell-unhighlight-at (- end 1)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1023 t)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1024 ((and (stringp poss) flyspell-highlight-flag)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1025 ;; correct
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1026 (flyspell-unhighlight-at start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1027 (if (> end start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1028 (flyspell-unhighlight-at (- end 1)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1029 t)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1030 ((null poss)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1031 (flyspell-unhighlight-at start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1032 (if (> end start)
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1033 (flyspell-unhighlight-at (- end 1))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1034 ((or (and (< flyspell-duplicate-distance 0)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1035 (or (save-excursion
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1036 (goto-char start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1037 (word-search-backward word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1038 (point-min)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1039 t))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1040 (save-excursion
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1041 (goto-char end)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1042 (word-search-forward word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1043 (point-max)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1044 t))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1045 (and (> flyspell-duplicate-distance 0)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1046 (or (save-excursion
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1047 (goto-char start)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1048 (word-search-backward
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1049 word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1050 (- start
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1051 flyspell-duplicate-distance)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1052 t))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1053 (save-excursion
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1054 (goto-char end)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1055 (word-search-forward
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1056 word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1057 (+ end
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1058 flyspell-duplicate-distance)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1059 t)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1060 (if flyspell-highlight-flag
56767
448c214b700f (flyspell-word): Use set-process-query-on-exit-flag.
Richard M. Stallman <rms@gnu.org>
parents: 56522
diff changeset
1061 (flyspell-highlight-duplicate-region start end poss)
22891
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
1062 (message (format "duplicate `%s'" word))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1063 (t
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1064 ;; incorrect highlight the location
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1065 (if flyspell-highlight-flag
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1066 (flyspell-highlight-incorrect-region start end poss)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1067 (flyspell-notify-misspell start end word poss))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1068 ;; return to original location
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
1069 (goto-char cursor-location)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1070 (if ispell-quit (setq ispell-quit nil)))))))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1071
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1072 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1073 ;* flyspell-tex-math-initialized ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1074 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1075 (defvar flyspell-tex-math-initialized nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1076
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1077 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1078 ;* flyspell-math-tex-command-p ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1079 ;* ------------------------------------------------------------- */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1080 ;* 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
1081 ;* 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
1082 ;* 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
1083 ;* 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
1084 ;* time that function is called. */
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 (defun flyspell-math-tex-command-p ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1087 (cond
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1088 (flyspell-check-tex-math-command
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1089 nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1090 ((eq flyspell-tex-math-initialized t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1091 (texmathp))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1092 ((eq flyspell-tex-math-initialized 'error)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1093 nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1094 (t
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1095 (setq flyspell-tex-math-initialized t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1096 (condition-case nil
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 (error (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1099 (setq flyspell-tex-math-initialized 'error)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1100 nil))))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1101
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1102 ;*---------------------------------------------------------------------*/
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1103 ;* flyspell-tex-command-p ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1104 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1105 (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
1106 "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
1107 (or (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1108 (let ((b (car (cdr word))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1109 (and (re-search-backward "\\\\" (- (point) 100) t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1110 (or (= (match-end 0) b)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1111 (and (goto-char (match-end 0))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1112 (looking-at flyspell-tex-command-regexp)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1113 (>= (match-end 0) b))))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1114 (flyspell-math-tex-command-p)))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1115
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1116 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1117 ;* flyspell-casechars-cache ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1118 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1119 (defvar flyspell-casechars-cache nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1120 (defvar flyspell-ispell-casechars-cache nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1121 (make-variable-buffer-local 'flyspell-casechars-cache)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1122 (make-variable-buffer-local 'flyspell-ispell-casechars-cache)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1123
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1124 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1125 ;* flyspell-get-casechars ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1126 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1127 (defun flyspell-get-casechars ()
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1128 "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
1129 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
1130 this function changes the last char of the `ispell-casechars' string."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1131 (let ((ispell-casechars (ispell-get-casechars)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1132 (cond
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1133 ((eq ispell-parser 'tex)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1134 (setq flyspell-ispell-casechars-cache ispell-casechars)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1135 (setq flyspell-casechars-cache
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1136 (concat (substring ispell-casechars
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1137 0
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1138 (- (length ispell-casechars) 1))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1139 "]"))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1140 flyspell-casechars-cache)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1141 (t
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1142 (setq flyspell-ispell-casechars-cache ispell-casechars)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1143 (setq flyspell-casechars-cache ispell-casechars)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1144 flyspell-casechars-cache))))
43016
ee78d55b45f4 Minor formatting fixes in preparation of merging new version.
Pavel Janík <Pavel@Janik.cz>
parents: 42684
diff changeset
1145
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1146 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1147 ;* flyspell-get-not-casechars-cache ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1148 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1149 (defvar flyspell-not-casechars-cache nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1150 (defvar flyspell-ispell-not-casechars-cache nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1151 (make-variable-buffer-local 'flyspell-not-casechars-cache)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1152 (make-variable-buffer-local 'flyspell-ispell-not-casechars-cache)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1153
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1154 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1155 ;* flyspell-get-not-casechars ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1156 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1157 (defun flyspell-get-not-casechars ()
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1158 "This function builds a string that is the regexp of non-word chars."
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1159 (let ((ispell-not-casechars (ispell-get-not-casechars)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1160 (cond
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1161 ((eq ispell-parser 'tex)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1162 (setq flyspell-ispell-not-casechars-cache ispell-not-casechars)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1163 (setq flyspell-not-casechars-cache
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1164 (concat (substring ispell-not-casechars
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1165 0
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1166 (- (length ispell-not-casechars) 1))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1167 "]"))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1168 flyspell-not-casechars-cache)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1169 (t
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1170 (setq flyspell-ispell-not-casechars-cache ispell-not-casechars)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1171 (setq flyspell-not-casechars-cache ispell-not-casechars)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1172 flyspell-not-casechars-cache))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1173
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1174 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1175 ;* flyspell-get-word ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1176 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1177 (defun flyspell-get-word (following)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1178 "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
1179 If argument FOLLOWING is non-nil or if `ispell-following-word'
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1180 is non-nil when called interactively, then the following word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1181 \(rather than preceding\) is checked when the cursor is not over a word.
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
1182 Optional second argument contains other chars that can be included in word
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1183 many times.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1184
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1185 Word syntax described by `ispell-dictionary-alist' (which see)."
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1186 (let* ((flyspell-casechars (flyspell-get-casechars))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1187 (flyspell-not-casechars (flyspell-get-not-casechars))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1188 (ispell-otherchars (ispell-get-otherchars))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1189 (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
1190 (word-regexp (if (string< "" ispell-otherchars)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1191 (concat flyspell-casechars
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1192 "+\\("
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1193 ispell-otherchars
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1194 "?"
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1195 flyspell-casechars
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1196 "+\\)"
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1197 (if ispell-many-otherchars-p
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1198 "*" "?"))
24943
59585a4135a6 (flyspell-get-word): Add special handling for when ispell-otherchars is empty.
Richard M. Stallman <rms@gnu.org>
parents: 24458
diff changeset
1199 (concat flyspell-casechars "+")))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1200 did-it-once
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1201 start end word)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1202 ;; find the word
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1203 (if (not (looking-at flyspell-casechars))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1204 (if following
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1205 (re-search-forward flyspell-casechars (point-max) t)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1206 (re-search-backward flyspell-casechars (point-min) t)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1207 ;; move to front of word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1208 (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
1209 (let ((pos nil))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1210 (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
1211 (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
1212 (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
1213 (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
1214 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
1215 (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
1216 (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
1217 (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
1218 (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
1219 (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
1220 (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
1221 (backward-char -1)))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1222 ;; 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
1223 (if (eq (re-search-forward word-regexp (point-max) t) nil)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1224 nil
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1225 (progn
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1226 (setq start (match-beginning 0)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1227 end (point)
36129
4c28e9406f50 (flyspell-get-word): Return string without
Dave Love <fx@gnu.org>
parents: 36120
diff changeset
1228 word (buffer-substring-no-properties start end))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1229 (list word start end)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1230
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1231 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1232 ;* flyspell-small-region ... */
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1233 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1234 (defun flyspell-small-region (beg end)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1235 "Flyspell text between BEG and END."
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1236 (save-excursion
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1237 (if (> beg end)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1238 (let ((old beg))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1239 (setq beg end)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1240 (setq end old)))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1241 (goto-char beg)
22612
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1242 (let ((count 0))
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1243 (while (< (point) end)
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1244 (if (and flyspell-issue-message-flag (= count 100))
22612
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1245 (progn
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1246 (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
1247 (* 100 (/ (float (- (point) beg)) (- end beg))))
22612
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1248 (setq count 0))
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1249 (setq count (+ 1 count)))
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1250 (flyspell-word)
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1251 (sit-for 0)
22612
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1252 (let ((cur (point)))
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1253 (forward-word 1)
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1254 (if (and (< (point) end) (> (point) (+ cur 1)))
6def3da74c7c Delete defcustom definition.
Richard M. Stallman <rms@gnu.org>
parents: 22611
diff changeset
1255 (backward-char 1)))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1256 (backward-char 1)
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1257 (if flyspell-issue-message-flag (message "Spell Checking completed."))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1258 (flyspell-word)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1259
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1260 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1261 ;* flyspell-external-ispell-process ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1262 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1263 (defvar flyspell-external-ispell-process '()
35617
da38a879b6fe Doc fixes. Add :version to new options.
Dave Love <fx@gnu.org>
parents: 35338
diff changeset
1264 "The external Flyspell Ispell process.")
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1265
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1266 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1267 ;* flyspell-external-ispell-buffer ... */
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-buffer '())
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1270 (defvar flyspell-large-region-buffer '())
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1271 (defvar flyspell-large-region-beg (point-min))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1272 (defvar flyspell-large-region-end (point-max))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1273
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 ;* flyspell-external-point-words ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1276 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1277 (defun flyspell-external-point-words ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1278 (let ((buffer flyspell-external-ispell-buffer))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1279 (set-buffer buffer)
58001
f6e978fdd3ed (flyspell-external-point-words): Use goto-char instead of beginning-of-buffer.
Richard M. Stallman <rms@gnu.org>
parents: 57936
diff changeset
1280 (goto-char (point-min))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1281 (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
1282 (start flyspell-large-region-beg))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1283 ;; 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
1284 ;; the initial buffer
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1285 (while (< (point) (- (point-max) 1))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1286 ;; we have to fetch the incorrect word
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1287 (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
1288 (let ((word (match-string 1)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1289 (goto-char (match-end 0))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1290 (set-buffer flyspell-large-region-buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1291 (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
1292 (if flyspell-issue-message-flag
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1293 (message "Spell Checking...%d%% [%s]"
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1294 (* 100 (/ (float (- (point) start)) size))
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1295 word))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1296 (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
1297 (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1298 (setq flyspell-large-region-beg (point))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1299 (goto-char (- (point) 1))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1300 (flyspell-word)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1301 (set-buffer buffer))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1302 (goto-char (point-max)))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1303 ;; we are done
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1304 (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
1305 ;; 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
1306 ;; have to kill the temporary buffer
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1307 (kill-buffer flyspell-external-ispell-buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1308 (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
1309
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1310 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1311 ;* flyspell-large-region ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1312 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1313 (defun flyspell-large-region (beg end)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1314 (let* ((curbuf (current-buffer))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1315 (buffer (get-buffer-create "*flyspell-region*")))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1316 (setq flyspell-external-ispell-buffer buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1317 (setq flyspell-large-region-buffer curbuf)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1318 (setq flyspell-large-region-beg beg)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1319 (setq flyspell-large-region-end end)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1320 (set-buffer buffer)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1321 (erase-buffer)
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
1322 ;; 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
1323 (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
1324 (set-buffer curbuf)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1325 (let ((c (apply 'call-process-region beg
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1326 end
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1327 ispell-program-name
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1328 nil
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1329 buffer
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1330 nil
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1331 "-l"
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1332 (let (args)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1333 ;; 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
1334 (if ispell-local-dictionary
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1335 (setq ispell-dictionary ispell-local-dictionary))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1336 (setq args (ispell-get-ispell-args))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1337 (if ispell-dictionary ; use specified dictionary
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1338 (setq args
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1339 (append (list "-d" ispell-dictionary) args)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1340 (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
1341 (setq args
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1342 (append args
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1343 (list "-p"
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1344 (expand-file-name
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1345 ispell-personal-dictionary)))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1346 (setq args (append args ispell-extra-args))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1347 args))))
53477
79093b308520 * progmodes/idlwave.el (idlwave-make-tags):
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53420
diff changeset
1348 (if (eq c 0)
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1349 (flyspell-external-point-words)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1350 (error "Can't check region...")))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1351
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1352 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1353 ;* flyspell-region ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1354 ;* ------------------------------------------------------------- */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1355 ;* 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
1356 ;* 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
1357 ;* 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
1358 ;* 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
1359 ;* regular flyspell means. */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1360 ;*---------------------------------------------------------------------*/
36120
927cbaaa27f8 (flyspell-region, flyspell-buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 35617
diff changeset
1361 ;;;###autoload
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1362 (defun flyspell-region (beg end)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1363 "Flyspell text between BEG and END."
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1364 (interactive "r")
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1365 (if (= beg end)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1366 ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1367 (save-excursion
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1368 (if (> beg end)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1369 (let ((old beg))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1370 (setq beg end)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1371 (setq end old)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1372 (if (> (- end beg) flyspell-large-region)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1373 (flyspell-large-region beg end)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1374 (flyspell-small-region beg end)))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1375
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1376 ;*---------------------------------------------------------------------*/
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1377 ;* flyspell-buffer ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1378 ;*---------------------------------------------------------------------*/
36120
927cbaaa27f8 (flyspell-region, flyspell-buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 35617
diff changeset
1379 ;;;###autoload
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1380 (defun flyspell-buffer ()
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1381 "Flyspell whole buffer."
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1382 (interactive)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1383 (flyspell-region (point-min) (point-max)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1384
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1385 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1386 ;* old next error position ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1387 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1388 (defvar flyspell-old-buffer-error nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1389 (defvar flyspell-old-pos-error nil)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1390
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1391 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1392 ;* flyspell-goto-next-error ... */
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 (defun flyspell-goto-next-error ()
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1395 "Go to the next previously detected error.
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1396 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
1397 FLYSPELL-BUFFER."
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1398 (interactive)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1399 (let ((pos (point))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1400 (max (point-max)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1401 (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
1402 (eq pos flyspell-old-pos-error))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1403 (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1404 (if (= flyspell-old-pos-error max)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1405 ;; goto beginning of buffer
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1406 (progn
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1407 (message "Restarting from beginning of buffer")
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1408 (goto-char (point-min)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1409 (forward-word 1))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1410 (setq pos (point))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1411 ;; seek the next error
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1412 (while (and (< pos max)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1413 (let ((ovs (overlays-at pos))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1414 (r '()))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1415 (while (and (not r) (consp ovs))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1416 (if (flyspell-overlay-p (car ovs))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1417 (setq r t)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1418 (setq ovs (cdr ovs))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1419 (not r)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1420 (setq pos (1+ pos)))
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
1421 ;; 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
1422 (setq flyspell-old-pos-error pos)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1423 (setq flyspell-old-buffer-error (current-buffer))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1424 (goto-char pos)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1425 (if (= pos max)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1426 (message "No more miss-spelled word!"))))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1427
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1428 ;*---------------------------------------------------------------------*/
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1429 ;* flyspell-overlay-p ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1430 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1431 (defun flyspell-overlay-p (o)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1432 "A predicate that return true iff O is an overlay used by flyspell."
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1433 (and (overlayp o) (overlay-get o 'flyspell-overlay)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1434
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1435 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1436 ;* flyspell-delete-all-overlays ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1437 ;* ------------------------------------------------------------- */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1438 ;* Remove all the overlays introduced by flyspell. */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1439 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1440 (defun flyspell-delete-all-overlays ()
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1441 "Delete all the overlays used by flyspell."
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1442 (let ((l (overlays-in (point-min) (point-max))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1443 (while (consp l)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1444 (progn
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1445 (if (flyspell-overlay-p (car l))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1446 (delete-overlay (car l)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1447 (setq l (cdr l))))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1448
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1449 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1450 ;* flyspell-unhighlight-at ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1451 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1452 (defun flyspell-unhighlight-at (pos)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1453 "Remove the flyspell overlay that are located at POS."
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1454 (if flyspell-persistent-highlight
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1455 (let ((overlays (overlays-at pos)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1456 (while (consp overlays)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1457 (if (flyspell-overlay-p (car overlays))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1458 (delete-overlay (car overlays)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1459 (setq overlays (cdr overlays))))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1460 (if (flyspell-overlay-p flyspell-overlay)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1461 (delete-overlay flyspell-overlay))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1462
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1463 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1464 ;* flyspell-properties-at-p ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1465 ;* ------------------------------------------------------------- */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1466 ;* Is there an highlight properties at position pos? */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1467 ;*---------------------------------------------------------------------*/
22891
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
1468 (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
1469 "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
1470 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
1471 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
1472 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
1473 (let ((prop (text-properties-at pos))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1474 (keep t))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1475 (while (and keep (consp prop))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1476 (if (and (eq (car prop) 'local-map) (consp (cdr prop)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1477 (setq prop (cdr (cdr prop)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1478 (setq keep nil)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1479 (consp prop)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1480
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1481 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1482 ;* make-flyspell-overlay ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1483 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1484 (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
1485 "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
1486 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
1487 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
1488 for the overlay."
24076
6236e60302e2 (make-flyspell-overlay): fix front stickiness.
Richard M. Stallman <rms@gnu.org>
parents: 23943
diff changeset
1489 (let ((flyspell-overlay (make-overlay beg end nil t nil)))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1490 (overlay-put flyspell-overlay 'face face)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1491 (overlay-put flyspell-overlay 'mouse-face mouse-face)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1492 (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
1493 (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
1494 (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
1495 (if flyspell-use-local-map
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1496 (overlay-put flyspell-overlay
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1497 flyspell-overlay-keymap-property-name
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1498 flyspell-mouse-map))
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1499 (when (eq face 'flyspell-incorrect-face)
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1500 (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
1501 (overlay-put flyspell-overlay 'before-string
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1502 flyspell-before-incorrect-word-string))
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1503 (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
1504 (overlay-put flyspell-overlay 'after-string
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1505 flyspell-after-incorrect-word-string)))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1506 flyspell-overlay))
43016
ee78d55b45f4 Minor formatting fixes in preparation of merging new version.
Pavel Janík <Pavel@Janik.cz>
parents: 42684
diff changeset
1507
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1508 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1509 ;* flyspell-highlight-incorrect-region ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1510 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1511 (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
1512 "Set up an overlay on a misspelled word, in the buffer from BEG to END."
55432
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1513 (let ((inhibit-read-only t))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1514 (unless (run-hook-with-args-until-success
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1515 'flyspell-incorrect-hook beg end poss)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1516 (if (or flyspell-highlight-properties
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1517 (not (flyspell-properties-at-p beg)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1518 (progn
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1519 ;; we cleanup current overlay at the same position
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1520 (if (and (not flyspell-persistent-highlight)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1521 (overlayp flyspell-overlay))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1522 (delete-overlay flyspell-overlay)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1523 (let ((overlays (overlays-at beg)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1524 (while (consp overlays)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1525 (if (flyspell-overlay-p (car overlays))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1526 (delete-overlay (car overlays)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1527 (setq overlays (cdr overlays)))))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1528 ;; now we can use a new overlay
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1529 (setq flyspell-overlay
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1530 (make-flyspell-overlay
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1531 beg end 'flyspell-incorrect-face 'highlight)))))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1532
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1533 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1534 ;* flyspell-highlight-duplicate-region ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1535 ;*---------------------------------------------------------------------*/
56767
448c214b700f (flyspell-word): Use set-process-query-on-exit-flag.
Richard M. Stallman <rms@gnu.org>
parents: 56522
diff changeset
1536 (defun flyspell-highlight-duplicate-region (beg end poss)
448c214b700f (flyspell-word): Use set-process-query-on-exit-flag.
Richard M. Stallman <rms@gnu.org>
parents: 56522
diff changeset
1537 "Set up an overlay on a duplicated word, in the buffer from BEG to END.
448c214b700f (flyspell-word): Use set-process-query-on-exit-flag.
Richard M. Stallman <rms@gnu.org>
parents: 56522
diff changeset
1538 ??? What does POSS mean?"
55432
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1539 (let ((inhibit-read-only t))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1540 (unless (run-hook-with-args-until-success
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1541 'flyspell-incorrect-hook beg end poss)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1542 (if (or flyspell-highlight-properties
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1543 (not (flyspell-properties-at-p beg)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1544 (progn
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1545 ;; we cleanup current overlay at the same position
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1546 (if (and (not flyspell-persistent-highlight)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1547 (overlayp flyspell-overlay))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1548 (delete-overlay flyspell-overlay)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1549 (let ((overlays (overlays-at beg)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1550 (while (consp overlays)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1551 (if (flyspell-overlay-p (car overlays))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1552 (delete-overlay (car overlays)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1553 (setq overlays (cdr overlays)))))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1554 ;; now we can use a new overlay
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1555 (setq flyspell-overlay
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1556 (make-flyspell-overlay beg end
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1557 'flyspell-duplicate-face
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
1558 'highlight)))))))
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1559
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1560 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1561 ;* flyspell-auto-correct-cache ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1562 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1563 (defvar flyspell-auto-correct-pos nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1564 (defvar flyspell-auto-correct-region nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1634
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1644 ;* flyspell-auto-correct-word ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1804 ;* flyspell-correct-word ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1805 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1809 (interactive "e")
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1812 ;; retain cursor location (I don't know why but save-excursion here fails).
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1813 (let ((save (point)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1814 (mouse-set-point event)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1815 (let ((cursor-location (point))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1816 (word (flyspell-get-word nil))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1817 start end poss replace)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1818 ;; destructure return word info list.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1819 (setq start (car (cdr word))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1820 end (car (cdr (cdr word)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1821 word (car word))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1822 ;; now check spelling of word.
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1823 (process-send-string ispell-process "%\n") ;put in verbose mode
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1824 (process-send-string ispell-process (concat "^" word "\n"))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1825 ;; wait until ispell has processed word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1826 (while (progn
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1827 (accept-process-output ispell-process)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1828 (not (string= "" (car ispell-filter)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1831 (setq poss (ispell-parse-output (car ispell-filter))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1832 (cond ((or (eq poss t) (stringp poss))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1833 ;; don't correct word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1834 t)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1835 ((null poss)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1836 ;; ispell error
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1837 (error "Ispell: error in Ispell process"))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1838 ((string-match "GNU" (emacs-version))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1843 nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1846 (process-send-string ispell-process (concat "*" word "\n"))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1847 (flyspell-unhighlight-at cursor-location)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1848 (setq ispell-pdict-modified-p '(t)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1849 ((or (eq replace 'buffer) (eq replace 'session))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1850 (process-send-string ispell-process (concat "@" word "\n"))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1851 (if (null ispell-pdict-modified-p)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1852 (setq ispell-pdict-modified-p
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1853 (list ispell-pdict-modified-p)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1856 (if (eq replace 'buffer)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1857 (ispell-add-per-file-word-list word)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1882
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1883 ;*---------------------------------------------------------------------*/
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1884 ;* flyspell-xemacs-correct ... */
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1887 "The xemacs popup menu callback."
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1888 (cond ((eq replace 'ignore)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1889 nil)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1890 ((eq replace 'save)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1893 (flyspell-unhighlight-at cursor-location)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1894 (setq ispell-pdict-modified-p '(t)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1895 ((or (eq replace 'buffer) (eq replace 'session))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1896 (process-send-string ispell-process (concat "@" word "\n"))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1897 (flyspell-unhighlight-at cursor-location)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1898 (if (null ispell-pdict-modified-p)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1899 (setq ispell-pdict-modified-p
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1900 (list ispell-pdict-modified-p)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1901 (if (eq replace 'buffer)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1902 (ispell-add-per-file-word-list word)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1932
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1938 (if (not event)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1939 (let* ((mouse-pos (mouse-position))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1940 (mouse-pos (if (nth 1 mouse-pos)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1941 mouse-pos
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
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
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1944 (mouse-position))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1945 (setq event (list (list (car (cdr mouse-pos))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1946 (1+ (cdr (cdr mouse-pos))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1947 (car mouse-pos)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1948 (let* ((corrects (if flyspell-sort-corrections
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1949 (sort (car (cdr (cdr poss))) 'string<)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1950 (car (cdr (cdr poss)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1951 (cor-menu (if (consp corrects)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1952 (mapcar (lambda (correct)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1953 (list correct correct))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1954 corrects)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1955 '()))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1956 (affix (car (cdr (cdr (cdr poss)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1957 (base-menu (let ((save (if (consp affix)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1958 (list
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1959 (list (concat "Save affix: " (car affix))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1960 'save)
43064
aad0b1eb2142 (flyspell-issue-message-flag): New user option.
Pavel Janík <Pavel@Janik.cz>
parents: 43016
diff changeset
1961 '("Accept (session)" session)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1962 '("Accept (buffer)" buffer))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1963 '(("Save word" save)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1964 ("Accept (session)" session)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1965 ("Accept (buffer)" buffer)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1966 (if (consp cor-menu)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1967 (append cor-menu (cons "" save))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1968 save)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1969 (menu (cons "flyspell correction menu" base-menu)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1970 (car (x-popup-menu event
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1971 (list (format "%s [%s]" word (or ispell-local-dictionary
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1972 ispell-dictionary))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1973 menu)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1974
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1975 ;*---------------------------------------------------------------------*/
22891
780c3ef895d7 (flyspell-duplicate-distance): Doc fix; change default to 10000.
Richard M. Stallman <rms@gnu.org>
parents: 22844
diff changeset
1976 ;* flyspell-xemacs-popup ... */
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1977 ;*---------------------------------------------------------------------*/
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1978 (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
1979 "The XEmacs popup menu."
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1980 (let* ((corrects (if flyspell-sort-corrections
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1981 (sort (car (cdr (cdr poss))) 'string<)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1982 (car (cdr (cdr poss)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1983 (cor-menu (if (consp corrects)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1984 (mapcar (lambda (correct)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1985 (vector correct
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1986 (list 'flyspell-xemacs-correct
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1987 correct
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1988 (list 'quote poss)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1989 word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1990 cursor-location
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1991 start
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1992 end
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
1993 save)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1994 t))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1995 corrects)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1996 '()))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1997 (affix (car (cdr (cdr (cdr poss)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1998 (menu (let ((save (if (consp affix)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1999 (vector
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2000 (concat "Save affix: " (car affix))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2001 (list 'flyspell-xemacs-correct
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2002 ''save
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2003 (list 'quote poss)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2004 word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2005 cursor-location
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2006 start
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2007 end
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2008 save)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2009 t)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2010 (vector
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2011 "Save word"
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2012 (list 'flyspell-xemacs-correct
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2013 ''save
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2014 (list 'quote poss)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2015 word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2016 cursor-location
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2017 start
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2018 end
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2019 save)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2020 t)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2021 (session (vector "Accept (session)"
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2022 (list 'flyspell-xemacs-correct
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2023 ''session
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2024 (list 'quote poss)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2025 word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2026 cursor-location
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2027 start
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2028 end
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2029 save)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2030 t))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2031 (buffer (vector "Accept (buffer)"
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2032 (list 'flyspell-xemacs-correct
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2033 ''buffer
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2034 (list 'quote poss)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2035 word
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2036 cursor-location
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2037 start
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2038 end
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2039 save)
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2040 t)))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2041 (if (consp cor-menu)
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2042 (append cor-menu (list "-" save session buffer))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2043 (list save session buffer)))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2044 (popup-menu (cons (format "%s [%s]" word (or ispell-local-dictionary
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2045 ispell-dictionary))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2046 menu))))
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2047
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2048 ;*---------------------------------------------------------------------*/
43016
ee78d55b45f4 Minor formatting fixes in preparation of merging new version.
Pavel Janík <Pavel@Janik.cz>
parents: 42684
diff changeset
2049 ;* Some example functions for real autocorrecting */
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2050 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2051 (defun flyspell-maybe-correct-transposition (beg end poss)
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2052 "Check replacements for transposed characters.
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2053
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2054 If the text between BEG and END is equal to a correction suggested by
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2055 Ispell, after transposing two adjacent characters, correct the text,
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2056 and return t.
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2057
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2058 The third arg POSS is either the symbol 'doublon' or a list of
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2059 possible corrections as returned by 'ispell-parse-output'.
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2060
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2061 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
2062 (when (consp poss)
55432
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2063 (catch 'done
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2064 (let ((str (buffer-substring beg end))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2065 (i 0) (len (- end beg)) tmp)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2066 (while (< (1+ i) len)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2067 (setq tmp (aref str i))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2068 (aset str i (aref str (1+ i)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2069 (aset str (1+ i) tmp)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2070 (when (member str (nth 2 poss))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2071 (save-excursion
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2072 (goto-char (+ beg i 1))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2073 (transpose-chars 1))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2074 (throw 'done t))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2075 (setq tmp (aref str i))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2076 (aset str i (aref str (1+ i)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2077 (aset str (1+ i) tmp)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2078 (setq i (1+ i))))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2079 nil)))
37008
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2080
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2081 (defun flyspell-maybe-correct-doubling (beg end poss)
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2082 "Check replacements for doubled characters.
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2083
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2084 If the text between BEG and END is equal to a correction suggested by
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2085 Ispell, after removing a pair of doubled characters, correct the text,
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2086 and return t.
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2087
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2088 The third arg POSS is either the symbol 'doublon' or a list of
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2089 possible corrections as returned by 'ispell-parse-output'.
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2090
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2091 This function is meant to be added to 'flyspell-incorrect-hook'."
f4b355161455 Some doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 37006
diff changeset
2092 (when (consp poss)
55432
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2093 (catch 'done
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2094 (let ((str (buffer-substring beg end))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2095 (i 0) (len (- end beg)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2096 (while (< (1+ i) len)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2097 (when (and (= (aref str i) (aref str (1+ i)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2098 (member (concat (substring str 0 (1+ i))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2099 (substring str (+ i 2)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2100 (nth 2 poss)))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2101 (goto-char (+ beg i))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2102 (delete-char 1)
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2103 (throw 'done t))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2104 (setq i (1+ i))))
2f1fd122c9fe 2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents: 53477
diff changeset
2105 nil)))
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2106
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2107 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2108 ;* flyspell-already-abbrevp ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2109 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2110 (defun flyspell-already-abbrevp (table word)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2111 (let ((sym (abbrev-symbol word table)))
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2112 (and sym (symbolp sym))))
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 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2115 ;* flyspell-change-abbrev ... */
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2116 ;*---------------------------------------------------------------------*/
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2117 (defun flyspell-change-abbrev (table old new)
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2118 (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
2119
30428
b7b96f09059d Update to author's version 1.5d.
Gerd Moellmann <gerd@gnu.org>
parents: 27787
diff changeset
2120 (provide 'flyspell)
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 37008
diff changeset
2121
58263
b838f6a6cb4d (flyspell-mouse-map): Pop the menu
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58001
diff changeset
2122 ;; arch-tag: 05d915b9-e9cf-44fb-9137-fc28f5eaab2a
22611
38463342cd56 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2123 ;;; flyspell.el ends here