2001-07-16 12:23:00 +00:00
|
|
|
;;; flyspell.el --- on-the-fly spell checker
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2006-12-09 04:06:06 +00:00
|
|
|
;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
|
2009-01-05 03:18:22 +00:00
|
|
|
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2004-07-24 21:35:56 +00:00
|
|
|
;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr>
|
2004-05-22 21:52:34 +00:00
|
|
|
;; Maintainer: FSF
|
1998-06-26 01:27:40 +00:00
|
|
|
;; Keywords: convenience
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2001-07-16 12:23:00 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2008-05-06 04:34:22 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1998-06-26 01:24:05 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 04:34:22 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1998-06-26 01:24:05 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 04:34:22 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
;;; Commentary:
|
1998-06-26 01:24:05 +00:00
|
|
|
;;
|
|
|
|
;; Flyspell is a minor Emacs mode performing on-the-fly spelling
|
1998-06-26 01:27:40 +00:00
|
|
|
;; checking.
|
2000-07-24 18:36:17 +00:00
|
|
|
;;
|
2001-01-26 18:52:53 +00:00
|
|
|
;; To enable Flyspell minor mode, type M-x flyspell-mode.
|
1998-08-03 03:27:54 +00:00
|
|
|
;; This applies only to the current buffer.
|
2000-07-24 18:36:17 +00:00
|
|
|
;;
|
|
|
|
;; To enable Flyspell in text representing computer programs, type
|
2001-01-26 18:52:53 +00:00
|
|
|
;; M-x flyspell-prog-mode.
|
|
|
|
;; In that mode only text inside comments is checked.
|
2002-01-29 13:42:12 +00:00
|
|
|
;;
|
1998-07-29 03:21:32 +00:00
|
|
|
;; Note: consider setting the variable ispell-parser to `tex' to
|
2000-07-24 18:36:17 +00:00
|
|
|
;; avoid TeX command checking; use `(setq ispell-parser 'tex)'.
|
2002-01-29 13:42:12 +00:00
|
|
|
;;
|
1998-06-26 01:24:05 +00:00
|
|
|
;; Some user variables control the behavior of flyspell. They are
|
|
|
|
;; those defined under the `User variables' comment.
|
|
|
|
|
|
|
|
;;; Code:
|
2002-01-29 13:42:12 +00:00
|
|
|
|
1998-06-26 01:24:05 +00:00
|
|
|
(require 'ispell)
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* Group ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defgroup flyspell nil
|
2001-03-26 16:31:20 +00:00
|
|
|
"Spell checking on the fly."
|
1998-06-26 01:24:05 +00:00
|
|
|
:tag "FlySpell"
|
|
|
|
:prefix "flyspell-"
|
2002-02-17 12:15:17 +00:00
|
|
|
:group 'ispell
|
2000-07-24 18:36:17 +00:00
|
|
|
:group 'processes)
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* User configuration ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defcustom flyspell-highlight-flag t
|
2005-11-16 17:00:29 +00:00
|
|
|
"How Flyspell should indicate misspelled words.
|
1998-07-29 03:21:32 +00:00
|
|
|
Non-nil means use highlight, nil means use minibuffer messages."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type 'boolean)
|
|
|
|
|
1998-07-29 03:21:32 +00:00
|
|
|
(defcustom flyspell-mark-duplications-flag t
|
2005-11-16 17:00:29 +00:00
|
|
|
"Non-nil means Flyspell reports a repeated word as an error.
|
2007-08-31 13:41:31 +00:00
|
|
|
See `flyspell-mark-duplications-exceptions' to add exceptions to this rule.
|
2005-08-15 23:48:30 +00:00
|
|
|
Detection of repeated words is not implemented in
|
|
|
|
\"large\" regions; see `flyspell-large-region'."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type 'boolean)
|
|
|
|
|
2007-08-31 13:41:31 +00:00
|
|
|
(defcustom flyspell-mark-duplications-exceptions
|
|
|
|
'(("francais" . ("nous" "vous")))
|
|
|
|
"A list of exceptions for duplicated words.
|
|
|
|
It should be a list of (LANGUAGE . EXCEPTION-LIST). LANGUAGE is matched
|
|
|
|
against the current dictionary and EXCEPTION-LIST is a list of strings.
|
|
|
|
The duplicated word is downcased before it is compared with the exceptions."
|
|
|
|
:group 'flyspell
|
|
|
|
:type '(alist :key-type string :value-type (repeat string)))
|
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
(defcustom flyspell-sort-corrections nil
|
2005-11-16 17:00:29 +00:00
|
|
|
"Non-nil means, sort the corrections alphabetically before popping them."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
1998-06-26 01:24:05 +00:00
|
|
|
:type 'boolean)
|
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
(defcustom flyspell-duplicate-distance -1
|
2005-11-16 17:00:29 +00:00
|
|
|
"The maximum distance for finding duplicates of unrecognized words.
|
1998-08-08 23:44:03 +00:00
|
|
|
This applies to the feature that when a word is not found in the dictionary,
|
|
|
|
if the same spelling occurs elsewhere in the buffer,
|
2005-06-10 10:46:38 +00:00
|
|
|
Flyspell uses a different face (`flyspell-duplicate') to highlight it.
|
1998-08-08 23:44:03 +00:00
|
|
|
This variable specifies how far to search to find such a duplicate.
|
1998-08-03 03:27:54 +00:00
|
|
|
-1 means no limit (search the whole buffer).
|
1998-08-08 23:44:03 +00:00
|
|
|
0 means do not search for duplicate unrecognized spellings."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
2008-04-06 21:01:50 +00:00
|
|
|
:type '(choice (const :tag "no limit" -1)
|
|
|
|
number))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
|
|
|
(defcustom flyspell-delay 3
|
2005-11-16 17:00:29 +00:00
|
|
|
"The number of seconds to wait before checking, after a \"delayed\" command."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type 'number)
|
|
|
|
|
|
|
|
(defcustom flyspell-persistent-highlight t
|
2005-11-16 17:00:29 +00:00
|
|
|
"Non-nil means misspelled words remain highlighted until corrected.
|
1998-08-08 06:17:03 +00:00
|
|
|
If this variable is nil, only the most recently detected misspelled word
|
|
|
|
is highlighted."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
(defcustom flyspell-highlight-properties t
|
2005-11-16 17:00:29 +00:00
|
|
|
"Non-nil means highlight incorrect words even if a property exists for this word."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
(defcustom flyspell-default-delayed-commands
|
|
|
|
'(self-insert-command
|
|
|
|
delete-backward-char
|
2000-07-24 18:36:17 +00:00
|
|
|
backward-or-forward-delete-char
|
|
|
|
delete-char
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
scrollbar-vertical-drag
|
|
|
|
backward-delete-char-untabify)
|
1998-07-29 03:21:32 +00:00
|
|
|
"The standard list of delayed commands for Flyspell.
|
|
|
|
See `flyspell-delayed-commands'."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
1998-06-26 01:24:05 +00:00
|
|
|
:type '(repeat (symbol)))
|
|
|
|
|
1998-07-29 03:21:32 +00:00
|
|
|
(defcustom flyspell-delayed-commands nil
|
|
|
|
"List of commands that are \"delayed\" for Flyspell mode.
|
1998-08-03 03:27:54 +00:00
|
|
|
After these commands, Flyspell checking is delayed for a short time,
|
|
|
|
whose length is specified by `flyspell-delay'."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type '(repeat (symbol)))
|
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
(defcustom flyspell-default-deplacement-commands
|
|
|
|
'(next-line
|
|
|
|
previous-line
|
|
|
|
scroll-up
|
|
|
|
scroll-down)
|
|
|
|
"The standard list of deplacement commands for Flyspell.
|
|
|
|
See `flyspell-deplacement-commands'."
|
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
2000-07-24 18:36:17 +00:00
|
|
|
:type '(repeat (symbol)))
|
|
|
|
|
|
|
|
(defcustom flyspell-deplacement-commands nil
|
|
|
|
"List of commands that are \"deplacement\" for Flyspell mode.
|
|
|
|
After these commands, Flyspell checking is performed only if the previous
|
|
|
|
command was not the very same command."
|
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
2000-07-24 18:36:17 +00:00
|
|
|
:type '(repeat (symbol)))
|
|
|
|
|
1998-06-26 01:24:05 +00:00
|
|
|
(defcustom flyspell-issue-welcome-flag t
|
2005-11-16 17:00:29 +00:00
|
|
|
"Non-nil means that Flyspell should display a welcome message when started."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type 'boolean)
|
|
|
|
|
2002-02-02 15:56:45 +00:00
|
|
|
(defcustom flyspell-issue-message-flag t
|
2005-11-16 17:00:29 +00:00
|
|
|
"Non-nil means that Flyspell emits messages when checking words."
|
2002-02-02 15:56:45 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type 'boolean)
|
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
(defcustom flyspell-incorrect-hook nil
|
2005-11-16 17:00:29 +00:00
|
|
|
"List of functions to be called when incorrect words are encountered.
|
2005-09-23 18:29:20 +00:00
|
|
|
Each function is given three arguments. The first two
|
|
|
|
arguments are the beginning and the end of the incorrect region.
|
|
|
|
The third is either the symbol `doublon' or the list
|
2005-06-14 11:36:04 +00:00
|
|
|
of possible corrections as returned by `ispell-parse-output'.
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-09-23 18:29:20 +00:00
|
|
|
If any of the functions return non-nil, the word is not highlighted as
|
2000-07-24 18:36:17 +00:00
|
|
|
incorrect."
|
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
2000-07-24 18:36:17 +00:00
|
|
|
:type 'hook)
|
|
|
|
|
2001-11-11 20:12:27 +00:00
|
|
|
(defcustom flyspell-default-dictionary nil
|
2000-07-24 18:36:17 +00:00
|
|
|
"A string that is the name of the default dictionary.
|
2001-01-26 18:52:53 +00:00
|
|
|
This is passed to the `ispell-change-dictionary' when flyspell is started.
|
2001-11-11 20:12:27 +00:00
|
|
|
If the variable `ispell-local-dictionary' or `ispell-dictionary' is non-nil
|
|
|
|
when flyspell is started, the value of that variable is used instead
|
|
|
|
of `flyspell-default-dictionary' to select the default dictionary.
|
|
|
|
Otherwise, if `flyspell-default-dictionary' is nil, it means to use
|
|
|
|
Ispell's ultimate default dictionary."
|
2000-07-24 18:36:17 +00:00
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
2001-11-12 08:17:15 +00:00
|
|
|
:type '(choice string (const :tag "Default" nil)))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
|
|
|
(defcustom flyspell-tex-command-regexp
|
|
|
|
"\\(\\(begin\\|end\\)[ \t]*{\\|\\(cite[a-z*]*\\|label\\|ref\\|eqref\\|usepackage\\|documentclass\\)[ \t]*\\(\\[[^]]*\\]\\)?{[^{}]*\\)"
|
|
|
|
"A string that is the regular expression that matches TeX commands."
|
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
2000-07-24 18:36:17 +00:00
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
(defcustom flyspell-check-tex-math-command nil
|
2006-11-03 15:11:44 +00:00
|
|
|
"Non-nil means check even inside TeX math environment.
|
2001-01-26 18:52:53 +00:00
|
|
|
TeX math environments are discovered by the TEXMATHP that implemented
|
|
|
|
inside the texmathp.el Emacs package. That package may be found at:
|
2000-07-24 18:36:17 +00:00
|
|
|
http://strw.leidenuniv.nl/~dominik/Tools"
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type 'boolean)
|
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
(defcustom flyspell-dictionaries-that-consider-dash-as-word-delimiter
|
|
|
|
'("francais" "deutsch8" "norsk")
|
|
|
|
"List of dictionary names that consider `-' as word delimiter."
|
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
2000-07-24 18:36:17 +00:00
|
|
|
:type '(repeat (string)))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
(defcustom flyspell-abbrev-p
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
nil
|
2005-11-16 17:00:29 +00:00
|
|
|
"If non-nil, add correction to abbreviation table."
|
1998-06-26 01:24:05 +00:00
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
1998-06-26 01:24:05 +00:00
|
|
|
:type 'boolean)
|
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
(defcustom flyspell-use-global-abbrev-table-p
|
|
|
|
nil
|
2005-11-16 17:00:29 +00:00
|
|
|
"If non-nil, prefer global abbrev table to local abbrev table."
|
2000-07-24 18:36:17 +00:00
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
2000-07-24 18:36:17 +00:00
|
|
|
:type 'boolean)
|
2002-01-29 13:42:12 +00:00
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
(defcustom flyspell-mode-line-string " Fly"
|
2005-11-16 17:00:29 +00:00
|
|
|
"String displayed on the modeline when flyspell is active.
|
2000-07-24 18:36:17 +00:00
|
|
|
Set this to nil if you don't want a modeline indicator."
|
|
|
|
:group 'flyspell
|
2002-01-08 23:57:15 +00:00
|
|
|
:type '(choice string (const :tag "None" nil)))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
|
|
|
(defcustom flyspell-large-region 1000
|
2005-11-16 17:00:29 +00:00
|
|
|
"The threshold that determines if a region is small.
|
2005-04-08 09:55:48 +00:00
|
|
|
If the region is smaller than this number of characters,
|
|
|
|
`flyspell-region' checks the words sequentially using regular
|
|
|
|
flyspell methods. Else, if the region is large, a new Ispell process is
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
spawned for speed.
|
|
|
|
|
2005-08-15 23:48:30 +00:00
|
|
|
Doubled words are not detected in a large region, because Ispell
|
|
|
|
does not check for them.
|
|
|
|
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
If `flyspell-large-region' is nil, all regions are treated as small."
|
2000-07-24 18:36:17 +00:00
|
|
|
:group 'flyspell
|
2001-01-26 18:52:53 +00:00
|
|
|
:version "21.1"
|
2005-08-15 23:48:30 +00:00
|
|
|
:type '(choice number (const :tag "All small" nil)))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2002-02-02 15:56:45 +00:00
|
|
|
(defcustom flyspell-insert-function (function insert)
|
2005-11-16 17:00:29 +00:00
|
|
|
"Function for inserting word by flyspell upon correction."
|
2002-02-02 15:56:45 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type 'function)
|
|
|
|
|
|
|
|
(defcustom flyspell-before-incorrect-word-string nil
|
|
|
|
"String used to indicate an incorrect word starting."
|
|
|
|
:group 'flyspell
|
|
|
|
:type '(choice string (const nil)))
|
|
|
|
|
|
|
|
(defcustom flyspell-after-incorrect-word-string nil
|
|
|
|
"String used to indicate an incorrect word ending."
|
|
|
|
:group 'flyspell
|
|
|
|
:type '(choice string (const nil)))
|
|
|
|
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(defcustom flyspell-use-meta-tab t
|
2005-11-16 17:00:29 +00:00
|
|
|
"Non-nil means that flyspell uses M-TAB to correct word."
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
:group 'flyspell
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
(defcustom flyspell-auto-correct-binding
|
2005-06-06 21:06:19 +00:00
|
|
|
[(control ?\;)]
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
"The key binding for flyspell auto correction."
|
|
|
|
:group 'flyspell)
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* Mode specific options */
|
|
|
|
;;* ------------------------------------------------------------- */
|
|
|
|
;;* Mode specific options enable users to disable flyspell on */
|
|
|
|
;;* certain word depending of the emacs mode. For instance, when */
|
|
|
|
;;* using flyspell with mail-mode add the following expression */
|
|
|
|
;;* in your .emacs file: */
|
|
|
|
;;* (add-hook 'mail-mode */
|
2006-05-21 20:57:08 +00:00
|
|
|
;;* '(lambda () (setq flyspell-generic-check-word-predicate */
|
|
|
|
;;* 'mail-mode-flyspell-verify))) */
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
2006-05-21 20:57:08 +00:00
|
|
|
(defvar flyspell-generic-check-word-predicate nil
|
1998-06-26 01:24:05 +00:00
|
|
|
"Function providing per-mode customization over which words are flyspelled.
|
1998-07-29 03:21:32 +00:00
|
|
|
Returns t to continue checking, nil otherwise.
|
|
|
|
Flyspell mode sets this variable to whatever is the `flyspell-mode-predicate'
|
|
|
|
property of the major mode name.")
|
2006-05-21 20:57:08 +00:00
|
|
|
(make-variable-buffer-local 'flyspell-generic-check-word-predicate)
|
|
|
|
(defvaralias 'flyspell-generic-check-word-p
|
|
|
|
'flyspell-generic-check-word-predicate)
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*--- mail mode -------------------------------------------------------*/
|
1998-07-29 03:21:32 +00:00
|
|
|
(put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
|
|
|
|
(put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
|
2007-10-29 18:32:32 +00:00
|
|
|
(defvar message-signature-separator)
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun mail-mode-flyspell-verify ()
|
2006-05-21 20:57:08 +00:00
|
|
|
"Function used for `flyspell-generic-check-word-predicate' in Mail mode."
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(let ((header-end (save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(re-search-forward
|
|
|
|
(concat "^"
|
|
|
|
(regexp-quote mail-header-separator)
|
|
|
|
"$")
|
|
|
|
nil t)
|
|
|
|
(point)))
|
2008-06-13 15:15:32 +00:00
|
|
|
(signature-begin
|
|
|
|
(if (not (boundp 'message-signature-separator))
|
|
|
|
(point-max)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-max))
|
|
|
|
(re-search-backward message-signature-separator nil t)
|
|
|
|
(point)))))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(cond ((< (point) header-end)
|
2001-01-16 14:04:21 +00:00
|
|
|
(and (save-excursion (beginning-of-line)
|
|
|
|
(looking-at "^Subject:"))
|
|
|
|
(> (point) (match-end 0))))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
((> (point) signature-begin)
|
2000-12-29 15:14:51 +00:00
|
|
|
nil)
|
|
|
|
(t
|
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line)
|
2005-03-23 14:39:08 +00:00
|
|
|
(not (looking-at "[>}|]\\|To:")))))))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*--- texinfo mode ----------------------------------------------------*/
|
1998-07-29 03:21:32 +00:00
|
|
|
(put 'texinfo-mode 'flyspell-mode-predicate 'texinfo-mode-flyspell-verify)
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun texinfo-mode-flyspell-verify ()
|
2006-05-21 20:57:08 +00:00
|
|
|
"Function used for `flyspell-generic-check-word-predicate' in Texinfo mode."
|
1998-06-26 01:24:05 +00:00
|
|
|
(save-excursion
|
|
|
|
(forward-word -1)
|
|
|
|
(not (looking-at "@"))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*--- tex mode --------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(put 'tex-mode 'flyspell-mode-predicate 'tex-mode-flyspell-verify)
|
|
|
|
(defun tex-mode-flyspell-verify ()
|
2006-05-21 20:57:08 +00:00
|
|
|
"Function used for `flyspell-generic-check-word-predicate' in LaTeX mode."
|
2000-07-24 18:36:17 +00:00
|
|
|
(and
|
|
|
|
(not (save-excursion
|
2005-12-22 01:51:40 +00:00
|
|
|
(re-search-backward "^[ \t]*%%%[ \t]+Local" nil t)))
|
2000-07-24 18:36:17 +00:00
|
|
|
(not (save-excursion
|
|
|
|
(let ((this (point-marker))
|
|
|
|
(e (progn (end-of-line) (point-marker))))
|
|
|
|
(beginning-of-line)
|
|
|
|
(if (re-search-forward "\\\\\\(cite\\|label\\|ref\\){[^}]*}" e t)
|
|
|
|
(and (>= this (match-beginning 0))
|
|
|
|
(<= this (match-end 0)) )))))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*--- sgml mode -------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(put 'sgml-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify)
|
|
|
|
(put 'html-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify)
|
2008-03-14 10:13:30 +00:00
|
|
|
(put 'nxml-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify)
|
2000-07-24 18:36:17 +00:00
|
|
|
|
|
|
|
(defun sgml-mode-flyspell-verify ()
|
2006-05-21 20:57:08 +00:00
|
|
|
"Function used for `flyspell-generic-check-word-predicate' in SGML mode."
|
2000-07-24 18:36:17 +00:00
|
|
|
(not (save-excursion
|
|
|
|
(let ((this (point-marker))
|
|
|
|
(s (progn (beginning-of-line) (point-marker)))
|
|
|
|
(e (progn (end-of-line) (point-marker))))
|
|
|
|
(or (progn
|
|
|
|
(goto-char this)
|
|
|
|
(and (re-search-forward "[^<]*>" e t)
|
|
|
|
(= (match-beginning 0) this)))
|
|
|
|
(progn
|
|
|
|
(goto-char this)
|
|
|
|
(and (re-search-backward "<[^>]*" s t)
|
|
|
|
(= (match-end 0) this)))
|
|
|
|
(and (progn
|
|
|
|
(goto-char this)
|
|
|
|
(and (re-search-forward "[^&]*;" e t)
|
|
|
|
(= (match-beginning 0) this)))
|
|
|
|
(progn
|
|
|
|
(goto-char this)
|
|
|
|
(and (re-search-backward "&[^;]*" s t)
|
|
|
|
(= (match-end 0) this)))))))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* Programming mode */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-11-22 21:05:36 +00:00
|
|
|
(defvar flyspell-prog-text-faces
|
|
|
|
'(font-lock-string-face font-lock-comment-face font-lock-doc-face)
|
|
|
|
"Faces corresponding to text in programming-mode buffers.")
|
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-generic-progmode-verify ()
|
2006-05-21 20:57:08 +00:00
|
|
|
"Used for `flyspell-generic-check-word-predicate' in programming modes."
|
2000-07-24 18:36:17 +00:00
|
|
|
(let ((f (get-text-property (point) 'face)))
|
2000-11-22 21:05:36 +00:00
|
|
|
(memq f flyspell-prog-text-faces)))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun flyspell-prog-mode ()
|
|
|
|
"Turn on `flyspell-mode' for comments and strings."
|
|
|
|
(interactive)
|
2006-05-21 20:57:08 +00:00
|
|
|
(setq flyspell-generic-check-word-predicate
|
|
|
|
'flyspell-generic-progmode-verify)
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(flyspell-mode 1)
|
|
|
|
(run-hooks 'flyspell-prog-mode-hook))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* Overlay compatibility */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(autoload 'make-overlay "overlay" "Overlay compatibility kit." t)
|
|
|
|
(autoload 'overlayp "overlay" "Overlay compatibility kit." t)
|
|
|
|
(autoload 'overlays-in "overlay" "Overlay compatibility kit." t)
|
|
|
|
(autoload 'delete-overlay "overlay" "Overlay compatibility kit." t)
|
|
|
|
(autoload 'overlays-at "overlay" "Overlay compatibility kit." t)
|
|
|
|
(autoload 'overlay-put "overlay" "Overlay compatibility kit." t)
|
|
|
|
(autoload 'overlay-get "overlay" "Overlay compatibility kit." t)
|
|
|
|
(autoload 'previous-overlay-change "overlay" "Overlay compatibility kit." t)
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* The minor mode declaration. */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-02-20 19:03:33 +00:00
|
|
|
(defvar flyspell-mouse-map
|
|
|
|
(let ((map (make-sparse-keymap)))
|
2004-11-16 15:29:10 +00:00
|
|
|
(define-key map (if (featurep 'xemacs) [button2] [down-mouse-2])
|
|
|
|
#'flyspell-correct-word)
|
2005-06-28 19:07:45 +00:00
|
|
|
map)
|
|
|
|
"Keymap for Flyspell to put on erroneous words.")
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-06-06 21:06:19 +00:00
|
|
|
(defvar flyspell-mode-map
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
(if flyspell-use-meta-tab
|
|
|
|
(define-key map "\M-\t" 'flyspell-auto-correct-word))
|
2005-06-28 19:07:45 +00:00
|
|
|
(define-key map flyspell-auto-correct-binding 'flyspell-auto-correct-previous-word)
|
|
|
|
(define-key map [(control ?\,)] 'flyspell-goto-next-error)
|
|
|
|
(define-key map [(control ?\.)] 'flyspell-auto-correct-word)
|
2006-11-11 01:00:10 +00:00
|
|
|
(define-key map [?\C-c ?$] 'flyspell-correct-word-before-point)
|
2005-06-28 19:07:45 +00:00
|
|
|
map)
|
|
|
|
"Minor mode keymap for Flyspell mode--for the whole buffer.")
|
2000-07-24 18:36:17 +00:00
|
|
|
|
|
|
|
;; dash character machinery
|
|
|
|
(defvar flyspell-consider-dash-as-word-delimiter-flag nil
|
|
|
|
"*Non-nil means that the `-' char is considered as a word delimiter.")
|
|
|
|
(make-variable-buffer-local 'flyspell-consider-dash-as-word-delimiter-flag)
|
|
|
|
(defvar flyspell-dash-dictionary nil)
|
|
|
|
(make-variable-buffer-local 'flyspell-dash-dictionary)
|
|
|
|
(defvar flyspell-dash-local-dictionary nil)
|
|
|
|
(make-variable-buffer-local 'flyspell-dash-local-dictionary)
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* Highlighting */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2005-06-10 10:46:38 +00:00
|
|
|
(defface flyspell-incorrect
|
2005-06-06 21:06:19 +00:00
|
|
|
'((((class color)) (:foreground "OrangeRed" :bold t :underline t))
|
|
|
|
(t (:bold t)))
|
2007-04-06 18:55:13 +00:00
|
|
|
"Face used for marking a misspelled word in Flyspell."
|
1998-07-29 03:21:32 +00:00
|
|
|
:group 'flyspell)
|
2005-06-10 10:46:38 +00:00
|
|
|
;; backward-compatibility alias
|
|
|
|
(put 'flyspell-incorrect-face 'face-alias 'flyspell-incorrect)
|
1998-07-29 03:21:32 +00:00
|
|
|
|
2005-06-10 10:46:38 +00:00
|
|
|
(defface flyspell-duplicate
|
2005-06-06 21:06:19 +00:00
|
|
|
'((((class color)) (:foreground "Gold3" :bold t :underline t))
|
|
|
|
(t (:bold t)))
|
2007-04-06 18:55:13 +00:00
|
|
|
"Face used for marking a misspelled word that appears twice in the buffer.
|
1998-08-08 23:44:03 +00:00
|
|
|
See also `flyspell-duplicate-distance'."
|
1998-07-29 03:21:32 +00:00
|
|
|
:group 'flyspell)
|
2005-06-10 10:46:38 +00:00
|
|
|
;; backward-compatibility alias
|
|
|
|
(put 'flyspell-duplicate-face 'face-alias 'flyspell-duplicate)
|
1998-07-29 03:21:32 +00:00
|
|
|
|
1998-06-26 01:24:05 +00:00
|
|
|
(defvar flyspell-overlay nil)
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-mode ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2005-08-15 01:49:51 +00:00
|
|
|
;;;###autoload(defvar flyspell-mode nil)
|
1998-06-26 01:24:05 +00:00
|
|
|
;;;###autoload
|
2005-06-08 08:14:32 +00:00
|
|
|
(define-minor-mode flyspell-mode
|
1998-06-26 01:24:05 +00:00
|
|
|
"Minor mode performing on-the-fly spelling checking.
|
2004-10-19 16:54:17 +00:00
|
|
|
This spawns a single Ispell process and checks each word.
|
1998-07-29 03:21:32 +00:00
|
|
|
The default flyspell behavior is to highlight incorrect words.
|
|
|
|
With no argument, this command toggles Flyspell mode.
|
2007-08-08 07:27:21 +00:00
|
|
|
With a prefix argument ARG, turn Flyspell minor mode on if ARG is positive,
|
|
|
|
otherwise turn it off.
|
2002-01-29 13:42:12 +00:00
|
|
|
|
1998-06-26 01:24:05 +00:00
|
|
|
Bindings:
|
|
|
|
\\[ispell-word]: correct words (using Ispell).
|
|
|
|
\\[flyspell-auto-correct-word]: automatically correct word.
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
\\[flyspell-auto-correct-previous-word]: automatically correct the last misspelled word.
|
|
|
|
\\[flyspell-correct-word] (or down-mouse-2): popup correct words.
|
1998-06-26 01:24:05 +00:00
|
|
|
|
|
|
|
Hooks:
|
2008-04-29 10:55:35 +00:00
|
|
|
This runs `flyspell-mode-hook' after flyspell mode is entered or exit.
|
1998-06-26 01:24:05 +00:00
|
|
|
|
|
|
|
Remark:
|
|
|
|
`flyspell-mode' uses `ispell-mode'. Thus all Ispell options are
|
2008-08-28 11:33:57 +00:00
|
|
|
valid. For instance, a different dictionary can be used by
|
1998-06-26 01:24:05 +00:00
|
|
|
invoking `ispell-change-dictionary'.
|
|
|
|
|
|
|
|
Consider using the `ispell-parser' to check your text. For instance
|
|
|
|
consider adding:
|
1998-07-29 03:21:32 +00:00
|
|
|
\(add-hook 'tex-mode-hook (function (lambda () (setq ispell-parser 'tex))))
|
1998-06-26 01:24:05 +00:00
|
|
|
in your .emacs file.
|
|
|
|
|
2001-11-10 01:20:22 +00:00
|
|
|
\\[flyspell-region] checks all words inside a region.
|
|
|
|
\\[flyspell-buffer] checks the whole buffer."
|
2005-06-08 08:14:32 +00:00
|
|
|
:lighter flyspell-mode-line-string
|
|
|
|
:keymap flyspell-mode-map
|
|
|
|
:group 'flyspell
|
|
|
|
(if flyspell-mode
|
2007-08-27 16:26:48 +00:00
|
|
|
(condition-case ()
|
|
|
|
(flyspell-mode-on)
|
|
|
|
(error (message "Enabling Flyspell mode gave an error")
|
|
|
|
(flyspell-mode -1)))
|
2005-06-08 08:14:32 +00:00
|
|
|
(flyspell-mode-off)))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2006-05-30 18:37:15 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun turn-on-flyspell ()
|
|
|
|
"Unconditionally turn on Flyspell mode."
|
|
|
|
(flyspell-mode 1))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun turn-off-flyspell ()
|
|
|
|
"Unconditionally turn off Flyspell mode."
|
|
|
|
(flyspell-mode -1))
|
|
|
|
|
|
|
|
(custom-add-option 'text-mode-hook 'turn-on-flyspell)
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-buffers ... */
|
|
|
|
;;* ------------------------------------------------------------- */
|
|
|
|
;;* For remembering buffers running flyspell */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defvar flyspell-buffers nil)
|
2002-01-29 13:42:12 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-minibuffer-p ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-minibuffer-p (buffer)
|
|
|
|
"Is BUFFER a minibuffer?"
|
|
|
|
(let ((ws (get-buffer-window-list buffer t)))
|
|
|
|
(and (consp ws) (window-minibuffer-p (car ws)))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-accept-buffer-local-defs ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2005-11-28 16:44:37 +00:00
|
|
|
(defvar flyspell-last-buffer nil
|
|
|
|
"The buffer in which the last flyspell operation took place.")
|
|
|
|
|
2006-01-05 21:52:16 +00:00
|
|
|
(defun flyspell-accept-buffer-local-defs (&optional force)
|
2005-11-28 16:44:37 +00:00
|
|
|
;; When flyspell-word is used inside a loop (e.g. when processing
|
|
|
|
;; flyspell-changes), the calls to `ispell-accept-buffer-local-defs' end
|
|
|
|
;; up dwarfing everything else, so only do it when the buffer has changed.
|
2006-01-05 21:52:16 +00:00
|
|
|
(when (or force (not (eq flyspell-last-buffer (current-buffer))))
|
2005-11-28 16:44:37 +00:00
|
|
|
(setq flyspell-last-buffer (current-buffer))
|
|
|
|
;; Strange problem: If buffer in current window has font-lock turned on,
|
|
|
|
;; but SET-BUFFER was called to point to an invisible buffer, this ispell
|
|
|
|
;; call will reset the buffer to the buffer in the current window.
|
|
|
|
;; However, it only happens at startup (fix by Albert L. Ting).
|
|
|
|
(save-current-buffer
|
|
|
|
(ispell-accept-buffer-local-defs))
|
|
|
|
(unless (and (eq flyspell-dash-dictionary ispell-dictionary)
|
|
|
|
(eq flyspell-dash-local-dictionary ispell-local-dictionary))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
;; The dictionary has changed
|
2005-11-28 16:44:37 +00:00
|
|
|
(setq flyspell-dash-dictionary ispell-dictionary)
|
|
|
|
(setq flyspell-dash-local-dictionary ispell-local-dictionary)
|
|
|
|
(setq flyspell-consider-dash-as-word-delimiter-flag
|
|
|
|
(member (or ispell-local-dictionary ispell-dictionary)
|
|
|
|
flyspell-dictionaries-that-consider-dash-as-word-delimiter)))))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2006-12-09 13:02:32 +00:00
|
|
|
(defun flyspell-hack-local-variables-hook ()
|
|
|
|
;; When local variables are loaded, see if the dictionary context
|
|
|
|
;; has changed.
|
|
|
|
(flyspell-accept-buffer-local-defs 'force))
|
|
|
|
|
2006-01-15 05:46:20 +00:00
|
|
|
(defun flyspell-kill-ispell-hook ()
|
|
|
|
(setq flyspell-last-buffer nil)
|
|
|
|
(dolist (buf (buffer-list))
|
2006-01-15 05:47:44 +00:00
|
|
|
(with-current-buffer buf
|
|
|
|
(kill-local-variable 'flyspell-word-cache-word))))
|
2006-01-15 05:46:20 +00:00
|
|
|
|
2006-01-17 16:35:52 +00:00
|
|
|
;; Make sure we flush our caches when needed. Do it here rather than in
|
|
|
|
;; flyspell-mode-on, since flyspell-region may be used without ever turning
|
|
|
|
;; on flyspell-mode.
|
|
|
|
(add-hook 'ispell-kill-ispell-hook 'flyspell-kill-ispell-hook)
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-mode-on ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-mode-on ()
|
1998-09-10 16:07:02 +00:00
|
|
|
"Turn Flyspell mode on. Do not use this; use `flyspell-mode' instead."
|
2008-04-23 20:39:10 +00:00
|
|
|
(ispell-set-spellchecker-params) ; Initialize variables and dicts alists
|
2005-06-10 10:46:38 +00:00
|
|
|
(setq ispell-highlight-face 'flyspell-incorrect)
|
2000-07-24 18:36:17 +00:00
|
|
|
;; local dictionaries setup
|
2005-02-27 10:36:38 +00:00
|
|
|
(or ispell-local-dictionary ispell-dictionary
|
|
|
|
(if flyspell-default-dictionary
|
|
|
|
(ispell-change-dictionary flyspell-default-dictionary)))
|
2000-07-24 18:36:17 +00:00
|
|
|
;; we have to force ispell to accept the local definition or
|
|
|
|
;; otherwise it could be too late, the local dictionary may
|
|
|
|
;; be forgotten!
|
2006-01-05 21:52:16 +00:00
|
|
|
;; Pass the `force' argument for the case where flyspell was active already
|
|
|
|
;; but the buffer's local-defs have been edited.
|
|
|
|
(flyspell-accept-buffer-local-defs 'force)
|
2002-05-08 15:27:26 +00:00
|
|
|
;; we put the `flyspell-delayed' property on some commands
|
1998-06-26 01:24:05 +00:00
|
|
|
(flyspell-delay-commands)
|
2002-05-08 15:27:26 +00:00
|
|
|
;; we put the `flyspell-deplacement' property on some commands
|
2000-07-24 18:36:17 +00:00
|
|
|
(flyspell-deplacement-commands)
|
1998-06-26 01:24:05 +00:00
|
|
|
;; we bound flyspell action to post-command hook
|
1998-08-08 23:44:03 +00:00
|
|
|
(add-hook 'post-command-hook (function flyspell-post-command-hook) t t)
|
1998-06-26 01:24:05 +00:00
|
|
|
;; we bound flyspell action to pre-command hook
|
1998-08-08 23:44:03 +00:00
|
|
|
(add-hook 'pre-command-hook (function flyspell-pre-command-hook) t t)
|
2000-07-24 18:36:17 +00:00
|
|
|
;; we bound flyspell action to after-change hook
|
2005-11-28 16:44:37 +00:00
|
|
|
(add-hook 'after-change-functions 'flyspell-after-change-function nil t)
|
2006-12-09 13:02:32 +00:00
|
|
|
;; we bound flyspell action to hack-local-variables-hook
|
|
|
|
(add-hook 'hack-local-variables-hook
|
|
|
|
(function flyspell-hack-local-variables-hook) t t)
|
2006-05-21 20:57:08 +00:00
|
|
|
;; set flyspell-generic-check-word-predicate based on the major mode
|
1998-07-29 03:21:32 +00:00
|
|
|
(let ((mode-predicate (get major-mode 'flyspell-mode-predicate)))
|
|
|
|
(if mode-predicate
|
2006-05-21 20:57:08 +00:00
|
|
|
(setq flyspell-generic-check-word-predicate mode-predicate)))
|
1998-06-26 01:24:05 +00:00
|
|
|
;; the welcome message
|
2002-02-02 15:56:45 +00:00
|
|
|
(if (and flyspell-issue-message-flag
|
|
|
|
flyspell-issue-welcome-flag
|
|
|
|
(interactive-p))
|
1998-08-03 03:27:54 +00:00
|
|
|
(let ((binding (where-is-internal 'flyspell-auto-correct-word
|
|
|
|
nil 'non-ascii)))
|
2005-09-18 12:28:30 +00:00
|
|
|
(message "%s"
|
1998-08-03 03:27:54 +00:00
|
|
|
(if binding
|
2000-07-24 18:36:17 +00:00
|
|
|
(format "Welcome to flyspell. Use %s or Mouse-2 to correct words."
|
1998-08-03 03:27:54 +00:00
|
|
|
(key-description binding))
|
2008-04-29 10:55:35 +00:00
|
|
|
"Welcome to flyspell. Use Mouse-2 to correct words.")))))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-delay-commands ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-delay-commands ()
|
1998-09-10 16:07:02 +00:00
|
|
|
"Install the standard set of Flyspell delayed commands."
|
2007-09-26 00:32:27 +00:00
|
|
|
(mapc 'flyspell-delay-command flyspell-default-delayed-commands)
|
1998-06-26 01:24:05 +00:00
|
|
|
(mapcar 'flyspell-delay-command flyspell-delayed-commands))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-delay-command ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-delay-command (command)
|
1998-09-10 16:07:02 +00:00
|
|
|
"Set COMMAND to be delayed, for Flyspell.
|
1998-06-26 01:24:05 +00:00
|
|
|
When flyspell `post-command-hook' is invoked because a delayed command
|
2001-03-26 16:31:20 +00:00
|
|
|
as been used the current word is not immediately checked.
|
1998-07-29 03:21:32 +00:00
|
|
|
It will be checked only after `flyspell-delay' seconds."
|
|
|
|
(interactive "SDelay Flyspell after Command: ")
|
1998-06-26 01:24:05 +00:00
|
|
|
(put command 'flyspell-delayed t))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-deplacement-commands ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-deplacement-commands ()
|
|
|
|
"Install the standard set of Flyspell deplacement commands."
|
2007-09-26 00:32:27 +00:00
|
|
|
(mapc 'flyspell-deplacement-command flyspell-default-deplacement-commands)
|
2000-07-24 18:36:17 +00:00
|
|
|
(mapcar 'flyspell-deplacement-command flyspell-deplacement-commands))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-deplacement-command ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-deplacement-command (command)
|
|
|
|
"Set COMMAND that implement cursor movements, for Flyspell.
|
|
|
|
When flyspell `post-command-hook' is invoked because of a deplacement command
|
|
|
|
as been used the current word is checked only if the previous command was
|
|
|
|
not the very same deplacement command."
|
|
|
|
(interactive "SDeplacement Flyspell after Command: ")
|
|
|
|
(put command 'flyspell-deplacement t))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-word-cache ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defvar flyspell-word-cache-start nil)
|
|
|
|
(defvar flyspell-word-cache-end nil)
|
|
|
|
(defvar flyspell-word-cache-word nil)
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(defvar flyspell-word-cache-result '_)
|
1998-06-26 01:24:05 +00:00
|
|
|
(make-variable-buffer-local 'flyspell-word-cache-start)
|
|
|
|
(make-variable-buffer-local 'flyspell-word-cache-end)
|
|
|
|
(make-variable-buffer-local 'flyspell-word-cache-word)
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(make-variable-buffer-local 'flyspell-word-cache-result)
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* The flyspell pre-hook, store the current position. In the */
|
|
|
|
;;* post command hook, we will check, if the word at this position */
|
|
|
|
;;* has to be spell checked. */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defvar flyspell-pre-buffer nil)
|
|
|
|
(defvar flyspell-pre-point nil)
|
|
|
|
(defvar flyspell-pre-column nil)
|
|
|
|
(defvar flyspell-pre-pre-buffer nil)
|
|
|
|
(defvar flyspell-pre-pre-point nil)
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-previous-command ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defvar flyspell-previous-command nil
|
|
|
|
"The last interactive command checked by Flyspell.")
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-pre-command-hook ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-pre-command-hook ()
|
1998-07-29 03:21:32 +00:00
|
|
|
"Save the current buffer and point for Flyspell's post-command hook."
|
1998-06-26 01:24:05 +00:00
|
|
|
(interactive)
|
|
|
|
(setq flyspell-pre-buffer (current-buffer))
|
2000-07-24 18:36:17 +00:00
|
|
|
(setq flyspell-pre-point (point))
|
|
|
|
(setq flyspell-pre-column (current-column)))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-mode-off ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-09-10 16:07:02 +00:00
|
|
|
;;;###autoload
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-mode-off ()
|
1998-09-10 16:07:02 +00:00
|
|
|
"Turn Flyspell mode off."
|
1998-06-26 01:24:05 +00:00
|
|
|
;; we remove the hooks
|
1998-08-08 23:44:03 +00:00
|
|
|
(remove-hook 'post-command-hook (function flyspell-post-command-hook) t)
|
|
|
|
(remove-hook 'pre-command-hook (function flyspell-pre-command-hook) t)
|
2005-11-28 16:44:37 +00:00
|
|
|
(remove-hook 'after-change-functions 'flyspell-after-change-function t)
|
2006-12-09 13:02:32 +00:00
|
|
|
(remove-hook 'hack-local-variables-hook
|
|
|
|
(function flyspell-hack-local-variables-hook) t)
|
1998-06-26 01:24:05 +00:00
|
|
|
;; we remove all the flyspell hilightings
|
|
|
|
(flyspell-delete-all-overlays)
|
|
|
|
;; we have to erase pre cache variables
|
|
|
|
(setq flyspell-pre-buffer nil)
|
|
|
|
(setq flyspell-pre-point nil)
|
|
|
|
;; we mark the mode as killed
|
|
|
|
(setq flyspell-mode nil))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-check-pre-word-p ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-check-pre-word-p ()
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
"Return non-nil if we should check the word before point.
|
1998-07-29 03:21:32 +00:00
|
|
|
More precisely, it applies to the word that was before point
|
|
|
|
before the current command."
|
1998-06-26 01:24:05 +00:00
|
|
|
(cond
|
|
|
|
((or (not (numberp flyspell-pre-point))
|
|
|
|
(not (bufferp flyspell-pre-buffer))
|
|
|
|
(not (buffer-live-p flyspell-pre-buffer)))
|
|
|
|
nil)
|
2000-07-24 18:36:17 +00:00
|
|
|
((and (eq flyspell-pre-pre-point flyspell-pre-point)
|
|
|
|
(eq flyspell-pre-pre-buffer flyspell-pre-buffer))
|
|
|
|
nil)
|
1998-08-03 03:27:54 +00:00
|
|
|
((or (and (= flyspell-pre-point (- (point) 1))
|
|
|
|
(eq (char-syntax (char-after flyspell-pre-point)) ?w))
|
1998-06-26 01:24:05 +00:00
|
|
|
(= flyspell-pre-point (point))
|
|
|
|
(= flyspell-pre-point (+ (point) 1)))
|
|
|
|
nil)
|
2000-07-24 18:36:17 +00:00
|
|
|
((and (symbolp this-command)
|
2002-01-12 21:40:32 +00:00
|
|
|
(not executing-kbd-macro)
|
2000-07-24 18:36:17 +00:00
|
|
|
(or (get this-command 'flyspell-delayed)
|
|
|
|
(and (get this-command 'flyspell-deplacement)
|
|
|
|
(eq flyspell-previous-command this-command)))
|
|
|
|
(or (= (current-column) 0)
|
|
|
|
(= (current-column) flyspell-pre-column)
|
2008-08-26 23:00:31 +00:00
|
|
|
;; If other post-command-hooks change the buffer,
|
|
|
|
;; flyspell-pre-point can lie past eob (bug#468).
|
|
|
|
(null (char-after flyspell-pre-point))
|
2000-07-24 18:36:17 +00:00
|
|
|
(eq (char-syntax (char-after flyspell-pre-point)) ?w)))
|
|
|
|
nil)
|
1998-06-26 01:24:05 +00:00
|
|
|
((not (eq (current-buffer) flyspell-pre-buffer))
|
|
|
|
t)
|
|
|
|
((not (and (numberp flyspell-word-cache-start)
|
|
|
|
(numberp flyspell-word-cache-end)))
|
|
|
|
t)
|
|
|
|
(t
|
|
|
|
(or (< flyspell-pre-point flyspell-word-cache-start)
|
|
|
|
(> flyspell-pre-point flyspell-word-cache-end)))))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* The flyspell after-change-hook, store the change position. In */
|
|
|
|
;;* the post command hook, we will check, if the word at this */
|
|
|
|
;;* position has to be spell checked. */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defvar flyspell-changes nil)
|
2005-11-28 16:44:37 +00:00
|
|
|
(make-variable-buffer-local 'flyspell-changes)
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-after-change-function ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-after-change-function (start stop len)
|
|
|
|
"Save the current buffer and point for Flyspell's post-command hook."
|
2005-11-28 16:44:37 +00:00
|
|
|
(push (cons start stop) flyspell-changes))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-check-changed-word-p ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-check-changed-word-p (start stop)
|
|
|
|
"Return t when the changed word has to be checked.
|
|
|
|
The answer depends of several criteria.
|
|
|
|
Mostly we check word delimiters."
|
|
|
|
(cond
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
((and (memq (char-after start) '(?\n ? )) (> stop start))
|
2000-07-24 18:36:17 +00:00
|
|
|
t)
|
|
|
|
((not (numberp flyspell-pre-point))
|
|
|
|
t)
|
|
|
|
((and (>= flyspell-pre-point start) (<= flyspell-pre-point stop))
|
|
|
|
nil)
|
|
|
|
((let ((pos (point)))
|
|
|
|
(or (>= pos start) (<= pos stop) (= pos (1+ stop))))
|
|
|
|
nil)
|
|
|
|
(t
|
|
|
|
t)))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-check-word-p ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-check-word-p ()
|
|
|
|
"Return t when the word at `point' has to be checked.
|
|
|
|
The answer depends of several criteria.
|
|
|
|
Mostly we check word delimiters."
|
|
|
|
(cond
|
|
|
|
((<= (- (point-max) 1) (point-min))
|
|
|
|
;; the buffer is not filled enough
|
|
|
|
nil)
|
|
|
|
((and (and (> (current-column) 0)
|
|
|
|
(not (eq (current-column) flyspell-pre-column)))
|
|
|
|
(save-excursion
|
|
|
|
(backward-char 1)
|
|
|
|
(and (looking-at (flyspell-get-not-casechars))
|
|
|
|
(or flyspell-consider-dash-as-word-delimiter-flag
|
2005-12-22 01:51:40 +00:00
|
|
|
(not (looking-at "-"))))))
|
2000-07-24 18:36:17 +00:00
|
|
|
;; yes because we have reached or typed a word delimiter.
|
|
|
|
t)
|
|
|
|
((symbolp this-command)
|
|
|
|
(cond
|
|
|
|
((get this-command 'flyspell-deplacement)
|
|
|
|
(not (eq flyspell-previous-command this-command)))
|
|
|
|
((get this-command 'flyspell-delayed)
|
|
|
|
;; the current command is not delayed, that
|
|
|
|
;; is that we must check the word now
|
2005-10-10 04:03:09 +00:00
|
|
|
(and (not unread-command-events)
|
|
|
|
(sit-for flyspell-delay)))
|
2000-07-24 18:36:17 +00:00
|
|
|
(t t)))
|
|
|
|
(t t)))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-debug-signal-no-check ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-debug-signal-no-check (msg obj)
|
|
|
|
(setq debug-on-error t)
|
2005-11-16 17:00:29 +00:00
|
|
|
(with-current-buffer (get-buffer-create "*flyspell-debug*")
|
|
|
|
(erase-buffer)
|
|
|
|
(insert "NO-CHECK:\n")
|
|
|
|
(insert (format " %S : %S\n" msg obj))))
|
|
|
|
|
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-debug-signal-pre-word-checked ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-debug-signal-pre-word-checked ()
|
|
|
|
(setq debug-on-error t)
|
2005-11-16 17:00:29 +00:00
|
|
|
(with-current-buffer (get-buffer-create "*flyspell-debug*")
|
|
|
|
(insert "PRE-WORD:\n")
|
|
|
|
(insert (format " pre-point : %S\n" flyspell-pre-point))
|
|
|
|
(insert (format " pre-buffer : %S\n" flyspell-pre-buffer))
|
|
|
|
(insert (format " cache-start: %S\n" flyspell-word-cache-start))
|
|
|
|
(insert (format " cache-end : %S\n" flyspell-word-cache-end))
|
|
|
|
(goto-char (point-max))))
|
|
|
|
|
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-debug-signal-word-checked ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-debug-signal-word-checked ()
|
|
|
|
(setq debug-on-error t)
|
2005-11-16 17:00:29 +00:00
|
|
|
(let ((oldbuf (current-buffer))
|
|
|
|
(point (point)))
|
|
|
|
(with-current-buffer (get-buffer-create "*flyspell-debug*")
|
2000-07-24 18:36:17 +00:00
|
|
|
(insert "WORD:\n")
|
|
|
|
(insert (format " this-cmd : %S\n" this-command))
|
|
|
|
(insert (format " delayed : %S\n" (and (symbolp this-command)
|
|
|
|
(get this-command 'flyspell-delayed))))
|
|
|
|
(insert (format " point : %S\n" point))
|
|
|
|
(insert (format " prev-char : [%c] %S\n"
|
2005-11-16 17:00:29 +00:00
|
|
|
(with-current-buffer oldbuf
|
2000-07-24 18:36:17 +00:00
|
|
|
(let ((c (if (> (point) (point-min))
|
|
|
|
(save-excursion
|
|
|
|
(backward-char 1)
|
|
|
|
(char-after (point)))
|
|
|
|
? )))
|
|
|
|
c))
|
2005-11-16 17:00:29 +00:00
|
|
|
(with-current-buffer oldbuf
|
2000-07-24 18:36:17 +00:00
|
|
|
(let ((c (if (> (point) (point-min))
|
|
|
|
(save-excursion
|
|
|
|
(backward-char 1)
|
|
|
|
(and (and (looking-at (flyspell-get-not-casechars)) 1)
|
|
|
|
(and (or flyspell-consider-dash-as-word-delimiter-flag
|
|
|
|
(not (looking-at "\\-"))) 2))))))
|
|
|
|
c))))
|
|
|
|
(insert (format " because : %S\n"
|
|
|
|
(cond
|
|
|
|
((not (and (symbolp this-command)
|
|
|
|
(get this-command 'flyspell-delayed)))
|
|
|
|
;; the current command is not delayed, that
|
|
|
|
;; is that we must check the word now
|
|
|
|
'not-delayed)
|
2005-11-16 17:00:29 +00:00
|
|
|
((with-current-buffer oldbuf
|
2000-07-24 18:36:17 +00:00
|
|
|
(let ((c (if (> (point) (point-min))
|
|
|
|
(save-excursion
|
|
|
|
(backward-char 1)
|
|
|
|
(and (looking-at (flyspell-get-not-casechars))
|
|
|
|
(or flyspell-consider-dash-as-word-delimiter-flag
|
|
|
|
(not (looking-at "\\-"))))))))
|
|
|
|
c))
|
|
|
|
;; yes because we have reached or typed a word delimiter.
|
|
|
|
'separator)
|
|
|
|
((not (integerp flyspell-delay))
|
|
|
|
;; yes because the user had set up a no-delay configuration.
|
|
|
|
'no-delay)
|
|
|
|
(t
|
|
|
|
'sit-for))))
|
|
|
|
(goto-char (point-max)))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-debug-signal-changed-checked ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-debug-signal-changed-checked ()
|
|
|
|
(setq debug-on-error t)
|
2005-11-16 17:00:29 +00:00
|
|
|
(let ((point (point)))
|
|
|
|
(with-current-buffer (get-buffer-create "*flyspell-debug*")
|
2000-07-24 18:36:17 +00:00
|
|
|
(insert "CHANGED WORD:\n")
|
|
|
|
(insert (format " point : %S\n" point))
|
|
|
|
(goto-char (point-max)))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-post-command-hook ... */
|
|
|
|
;;* ------------------------------------------------------------- */
|
|
|
|
;;* It is possible that we check several words: */
|
|
|
|
;;* 1- the current word is checked if the predicate */
|
|
|
|
;;* FLYSPELL-CHECK-WORD-P is true */
|
|
|
|
;;* 2- the word that used to be the current word before the */
|
|
|
|
;;* THIS-COMMAND is checked if: */
|
|
|
|
;;* a- the previous word is different from the current word */
|
|
|
|
;;* b- the previous word as not just been checked by the */
|
|
|
|
;;* previous FLYSPELL-POST-COMMAND-HOOK */
|
|
|
|
;;* 3- the words changed by the THIS-COMMAND that are neither the */
|
|
|
|
;;* previous word nor the current word */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-post-command-hook ()
|
|
|
|
"The `post-command-hook' used by flyspell to check a word in-the-fly."
|
|
|
|
(interactive)
|
2005-11-03 21:33:22 +00:00
|
|
|
(let ((command this-command)
|
|
|
|
;; Prevent anything we do from affecting the mark.
|
|
|
|
deactivate-mark)
|
2000-07-24 18:36:17 +00:00
|
|
|
(if (flyspell-check-pre-word-p)
|
2005-11-16 17:00:29 +00:00
|
|
|
(with-current-buffer flyspell-pre-buffer
|
2000-07-24 18:36:17 +00:00
|
|
|
'(flyspell-debug-signal-pre-word-checked)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char flyspell-pre-point)
|
|
|
|
(flyspell-word))))
|
|
|
|
(if (flyspell-check-word-p)
|
|
|
|
(progn
|
|
|
|
'(flyspell-debug-signal-word-checked)
|
|
|
|
(flyspell-word)
|
|
|
|
;; we remember which word we have just checked.
|
|
|
|
;; this will be used next time we will check a word
|
|
|
|
;; to compare the next current word with the word
|
|
|
|
;; that as been registered in the pre-command-hook
|
|
|
|
;; that is these variables are used within the predicate
|
|
|
|
;; FLYSPELL-CHECK-PRE-WORD-P
|
|
|
|
(setq flyspell-pre-pre-buffer (current-buffer))
|
|
|
|
(setq flyspell-pre-pre-point (point)))
|
|
|
|
(progn
|
|
|
|
(setq flyspell-pre-pre-buffer nil)
|
|
|
|
(setq flyspell-pre-pre-point nil)
|
|
|
|
;; when a word is not checked because of a delayed command
|
|
|
|
;; we do not disable the ispell cache.
|
|
|
|
(if (and (symbolp this-command) (get this-command 'flyspell-delayed))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(progn
|
|
|
|
(setq flyspell-word-cache-end -1)
|
|
|
|
(setq flyspell-word-cache-result '_)))))
|
2005-11-28 16:44:37 +00:00
|
|
|
(while (and (not (input-pending-p)) (consp flyspell-changes))
|
2000-07-24 18:36:17 +00:00
|
|
|
(let ((start (car (car flyspell-changes)))
|
|
|
|
(stop (cdr (car flyspell-changes))))
|
|
|
|
(if (flyspell-check-changed-word-p start stop)
|
|
|
|
(save-excursion
|
|
|
|
'(flyspell-debug-signal-changed-checked)
|
|
|
|
(goto-char start)
|
|
|
|
(flyspell-word)))
|
|
|
|
(setq flyspell-changes (cdr flyspell-changes))))
|
|
|
|
(setq flyspell-previous-command command)))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-notify-misspell ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
(defun flyspell-notify-misspell (word poss)
|
2000-07-24 18:36:17 +00:00
|
|
|
(let ((replacements (if (stringp poss)
|
|
|
|
poss
|
|
|
|
(if flyspell-sort-corrections
|
|
|
|
(sort (car (cdr (cdr poss))) 'string<)
|
|
|
|
(car (cdr (cdr poss)))))))
|
2002-02-02 15:56:45 +00:00
|
|
|
(if flyspell-issue-message-flag
|
2005-11-14 04:53:14 +00:00
|
|
|
(message "misspelling `%s' %S" word replacements))))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-word-search-backward ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(defun flyspell-word-search-backward (word bound)
|
|
|
|
(save-excursion
|
|
|
|
(let ((r '())
|
2006-10-18 04:13:46 +00:00
|
|
|
(inhibit-point-motion-hooks t)
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
p)
|
|
|
|
(while (and (not r) (setq p (search-backward word bound t)))
|
|
|
|
(let ((lw (flyspell-get-word '())))
|
|
|
|
(if (and (consp lw) (string-equal (car lw) word))
|
|
|
|
(setq r p)
|
|
|
|
(goto-char p))))
|
|
|
|
r)))
|
2005-06-14 11:36:04 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-word-search-forward ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(defun flyspell-word-search-forward (word bound)
|
|
|
|
(save-excursion
|
|
|
|
(let ((r '())
|
2006-10-18 04:13:46 +00:00
|
|
|
(inhibit-point-motion-hooks t)
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
p)
|
|
|
|
(while (and (not r) (setq p (search-forward word bound t)))
|
|
|
|
(let ((lw (flyspell-get-word '())))
|
|
|
|
(if (and (consp lw) (string-equal (car lw) word))
|
|
|
|
(setq r p)
|
|
|
|
(goto-char (1+ p)))))
|
|
|
|
r)))
|
2005-06-14 11:36:04 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-word ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-word (&optional following)
|
|
|
|
"Spell check a word."
|
2004-11-04 10:20:35 +00:00
|
|
|
(interactive (list ispell-following-word))
|
2008-04-23 20:39:10 +00:00
|
|
|
(ispell-set-spellchecker-params) ; Initialize variables and dicts alists
|
1998-06-26 01:24:05 +00:00
|
|
|
(save-excursion
|
2000-07-24 18:36:17 +00:00
|
|
|
;; use the correct dictionary
|
2001-01-26 18:52:53 +00:00
|
|
|
(flyspell-accept-buffer-local-defs)
|
2000-07-24 18:36:17 +00:00
|
|
|
(let* ((cursor-location (point))
|
2005-11-16 17:00:29 +00:00
|
|
|
(flyspell-word (flyspell-get-word following))
|
2006-09-14 01:19:38 +00:00
|
|
|
start end poss word ispell-filter)
|
2000-07-24 18:36:17 +00:00
|
|
|
(if (or (eq flyspell-word nil)
|
2006-05-21 20:57:08 +00:00
|
|
|
(and (fboundp flyspell-generic-check-word-predicate)
|
|
|
|
(not (funcall flyspell-generic-check-word-predicate))))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
t
|
1998-06-26 01:24:05 +00:00
|
|
|
(progn
|
2000-07-24 18:36:17 +00:00
|
|
|
;; destructure return flyspell-word info list.
|
|
|
|
(setq start (car (cdr flyspell-word))
|
|
|
|
end (car (cdr (cdr flyspell-word)))
|
|
|
|
word (car flyspell-word))
|
1998-06-26 01:24:05 +00:00
|
|
|
;; before checking in the directory, we check for doublons.
|
|
|
|
(cond
|
2000-07-24 18:36:17 +00:00
|
|
|
((and (or (not (eq ispell-parser 'tex))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(and (> start (point-min))
|
2005-06-06 21:06:19 +00:00
|
|
|
(not (memq (char-after (1- start)) '(?\} ?\\)))))
|
2000-07-24 18:36:17 +00:00
|
|
|
flyspell-mark-duplications-flag
|
2007-08-31 13:41:31 +00:00
|
|
|
(not (catch 'exception
|
|
|
|
(dolist (except flyspell-mark-duplications-exceptions)
|
|
|
|
(and (string= (or ispell-local-dictionary
|
|
|
|
ispell-dictionary)
|
|
|
|
(car except))
|
|
|
|
(member (downcase word) (cdr except))
|
|
|
|
(throw 'exception t)))))
|
1998-06-26 01:24:05 +00:00
|
|
|
(save-excursion
|
2006-10-22 21:29:33 +00:00
|
|
|
(goto-char start)
|
|
|
|
(let* ((bound
|
|
|
|
(- start
|
|
|
|
(- end start)
|
|
|
|
(- (skip-chars-backward " \t\n\f"))))
|
|
|
|
(p (when (>= bound (point-min))
|
|
|
|
(flyspell-word-search-backward word bound))))
|
|
|
|
(and p (/= p start)))))
|
1998-06-26 01:24:05 +00:00
|
|
|
;; yes, this is a doublon
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(flyspell-highlight-incorrect-region start end 'doublon)
|
|
|
|
nil)
|
1998-06-26 01:24:05 +00:00
|
|
|
((and (eq flyspell-word-cache-start start)
|
|
|
|
(eq flyspell-word-cache-end end)
|
|
|
|
(string-equal flyspell-word-cache-word word))
|
|
|
|
;; this word had been already checked, we skip
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
flyspell-word-cache-result)
|
1998-06-26 01:24:05 +00:00
|
|
|
((and (eq ispell-parser 'tex)
|
2000-07-24 18:36:17 +00:00
|
|
|
(flyspell-tex-command-p flyspell-word))
|
1998-06-26 01:24:05 +00:00
|
|
|
;; this is a correct word (because a tex command)
|
|
|
|
(flyspell-unhighlight-at start)
|
|
|
|
(if (> end start)
|
|
|
|
(flyspell-unhighlight-at (- end 1)))
|
|
|
|
t)
|
|
|
|
(t
|
|
|
|
;; we setup the cache
|
|
|
|
(setq flyspell-word-cache-start start)
|
|
|
|
(setq flyspell-word-cache-end end)
|
|
|
|
(setq flyspell-word-cache-word word)
|
|
|
|
;; now check spelling of word.
|
2005-11-16 17:00:29 +00:00
|
|
|
(ispell-send-string "%\n")
|
1998-06-26 01:24:05 +00:00
|
|
|
;; put in verbose mode
|
2005-11-16 17:00:29 +00:00
|
|
|
(ispell-send-string (concat "^" word "\n"))
|
1998-08-03 03:27:54 +00:00
|
|
|
;; we mark the ispell process so it can be killed
|
|
|
|
;; when emacs is exited without query
|
2004-08-22 17:15:55 +00:00
|
|
|
(set-process-query-on-exit-flag ispell-process nil)
|
2005-11-16 17:00:29 +00:00
|
|
|
;; Wait until ispell has processed word. Since this code is often
|
2005-11-28 16:44:37 +00:00
|
|
|
;; executed from post-command-hook but the ispell process may not
|
2005-11-16 17:00:29 +00:00
|
|
|
;; be responsive, it's important to make sure we re-enable C-g.
|
|
|
|
(with-local-quit
|
|
|
|
(while (progn
|
|
|
|
(accept-process-output ispell-process)
|
|
|
|
(not (string= "" (car ispell-filter))))))
|
|
|
|
;; (ispell-send-string "!\n")
|
1998-06-26 01:24:05 +00:00
|
|
|
;; back to terse mode.
|
2006-09-14 01:19:38 +00:00
|
|
|
;; Remove leading empty element
|
1998-06-26 01:24:05 +00:00
|
|
|
(setq ispell-filter (cdr ispell-filter))
|
2006-09-14 01:19:38 +00:00
|
|
|
;; ispell process should return something after word is sent.
|
|
|
|
;; Tag word as valid (i.e., skip) otherwise
|
|
|
|
(or ispell-filter
|
|
|
|
(setq ispell-filter '(*)))
|
2000-07-24 18:36:17 +00:00
|
|
|
(if (consp ispell-filter)
|
1998-06-26 01:24:05 +00:00
|
|
|
(setq poss (ispell-parse-output (car ispell-filter))))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(let ((res (cond ((eq poss t)
|
|
|
|
;; correct
|
|
|
|
(setq flyspell-word-cache-result t)
|
|
|
|
(flyspell-unhighlight-at start)
|
|
|
|
(if (> end start)
|
|
|
|
(flyspell-unhighlight-at (- end 1)))
|
|
|
|
t)
|
|
|
|
((and (stringp poss) flyspell-highlight-flag)
|
|
|
|
;; correct
|
|
|
|
(setq flyspell-word-cache-result t)
|
|
|
|
(flyspell-unhighlight-at start)
|
|
|
|
(if (> end start)
|
|
|
|
(flyspell-unhighlight-at (- end 1)))
|
|
|
|
t)
|
|
|
|
((null poss)
|
|
|
|
(setq flyspell-word-cache-result t)
|
|
|
|
(flyspell-unhighlight-at start)
|
|
|
|
(if (> end start)
|
|
|
|
(flyspell-unhighlight-at (- end 1)))
|
|
|
|
t)
|
|
|
|
((or (and (< flyspell-duplicate-distance 0)
|
|
|
|
(or (save-excursion
|
|
|
|
(goto-char start)
|
|
|
|
(flyspell-word-search-backward
|
|
|
|
word
|
|
|
|
(point-min)))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char end)
|
|
|
|
(flyspell-word-search-forward
|
|
|
|
word
|
|
|
|
(point-max)))))
|
|
|
|
(and (> flyspell-duplicate-distance 0)
|
|
|
|
(or (save-excursion
|
|
|
|
(goto-char start)
|
|
|
|
(flyspell-word-search-backward
|
|
|
|
word
|
|
|
|
(- start
|
|
|
|
flyspell-duplicate-distance)))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char end)
|
|
|
|
(flyspell-word-search-forward
|
|
|
|
word
|
|
|
|
(+ end
|
|
|
|
flyspell-duplicate-distance))))))
|
2005-09-23 18:29:20 +00:00
|
|
|
;; This is a misspelled word which occurs
|
|
|
|
;; twice within flyspell-duplicate-distance.
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(setq flyspell-word-cache-result nil)
|
|
|
|
(if flyspell-highlight-flag
|
|
|
|
(flyspell-highlight-duplicate-region
|
|
|
|
start end poss)
|
2005-09-18 12:28:30 +00:00
|
|
|
(message "duplicate `%s'" word))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
nil)
|
|
|
|
(t
|
|
|
|
(setq flyspell-word-cache-result nil)
|
|
|
|
;; incorrect highlight the location
|
|
|
|
(if flyspell-highlight-flag
|
|
|
|
(flyspell-highlight-incorrect-region
|
|
|
|
start end poss)
|
2005-11-16 17:00:29 +00:00
|
|
|
(flyspell-notify-misspell word poss))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
nil))))
|
|
|
|
;; return to original location
|
2005-06-14 11:36:04 +00:00
|
|
|
(goto-char cursor-location)
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(if ispell-quit (setq ispell-quit nil))
|
|
|
|
res))))))))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-math-tex-command-p ... */
|
|
|
|
;;* ------------------------------------------------------------- */
|
2008-09-17 00:55:38 +00:00
|
|
|
;;* This function uses the texmathp package to check if point */
|
|
|
|
;;* is within a TeX math environment. `texmathp' can yield errors */
|
|
|
|
;;* if the document is currently not valid TeX syntax. */
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-math-tex-command-p ()
|
2005-06-06 21:06:19 +00:00
|
|
|
(when (fboundp 'texmathp)
|
2008-09-17 00:55:38 +00:00
|
|
|
(if flyspell-check-tex-math-command
|
|
|
|
nil
|
2005-06-06 21:06:19 +00:00
|
|
|
(condition-case nil
|
|
|
|
(texmathp)
|
2008-09-17 00:55:38 +00:00
|
|
|
(error nil)))))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-tex-command-p ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-tex-command-p (word)
|
1998-07-29 03:21:32 +00:00
|
|
|
"Return t if WORD is a TeX command."
|
2000-07-24 18:36:17 +00:00
|
|
|
(or (save-excursion
|
|
|
|
(let ((b (car (cdr word))))
|
|
|
|
(and (re-search-backward "\\\\" (- (point) 100) t)
|
|
|
|
(or (= (match-end 0) b)
|
|
|
|
(and (goto-char (match-end 0))
|
|
|
|
(looking-at flyspell-tex-command-regexp)
|
|
|
|
(>= (match-end 0) b))))))
|
|
|
|
(flyspell-math-tex-command-p)))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-casechars-cache ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defvar flyspell-casechars-cache nil)
|
|
|
|
(defvar flyspell-ispell-casechars-cache nil)
|
|
|
|
(make-variable-buffer-local 'flyspell-casechars-cache)
|
|
|
|
(make-variable-buffer-local 'flyspell-ispell-casechars-cache)
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-get-casechars ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-get-casechars ()
|
|
|
|
"This function builds a string that is the regexp of word chars.
|
1998-07-29 03:21:32 +00:00
|
|
|
In order to avoid one useless string construction,
|
|
|
|
this function changes the last char of the `ispell-casechars' string."
|
1998-06-26 01:24:05 +00:00
|
|
|
(let ((ispell-casechars (ispell-get-casechars)))
|
|
|
|
(cond
|
2000-07-24 18:36:17 +00:00
|
|
|
((eq ispell-parser 'tex)
|
1998-06-26 01:24:05 +00:00
|
|
|
(setq flyspell-ispell-casechars-cache ispell-casechars)
|
|
|
|
(setq flyspell-casechars-cache
|
|
|
|
(concat (substring ispell-casechars
|
|
|
|
0
|
|
|
|
(- (length ispell-casechars) 1))
|
2000-07-24 18:36:17 +00:00
|
|
|
"]"))
|
1998-06-26 01:24:05 +00:00
|
|
|
flyspell-casechars-cache)
|
|
|
|
(t
|
|
|
|
(setq flyspell-ispell-casechars-cache ispell-casechars)
|
|
|
|
(setq flyspell-casechars-cache ispell-casechars)
|
|
|
|
flyspell-casechars-cache))))
|
2002-01-29 13:42:12 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-get-not-casechars-cache ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defvar flyspell-not-casechars-cache nil)
|
|
|
|
(defvar flyspell-ispell-not-casechars-cache nil)
|
|
|
|
(make-variable-buffer-local 'flyspell-not-casechars-cache)
|
|
|
|
(make-variable-buffer-local 'flyspell-ispell-not-casechars-cache)
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-get-not-casechars ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-get-not-casechars ()
|
|
|
|
"This function builds a string that is the regexp of non-word chars."
|
|
|
|
(let ((ispell-not-casechars (ispell-get-not-casechars)))
|
|
|
|
(cond
|
2000-07-24 18:36:17 +00:00
|
|
|
((eq ispell-parser 'tex)
|
1998-06-26 01:24:05 +00:00
|
|
|
(setq flyspell-ispell-not-casechars-cache ispell-not-casechars)
|
|
|
|
(setq flyspell-not-casechars-cache
|
|
|
|
(concat (substring ispell-not-casechars
|
|
|
|
0
|
|
|
|
(- (length ispell-not-casechars) 1))
|
2000-07-24 18:36:17 +00:00
|
|
|
"]"))
|
1998-06-26 01:24:05 +00:00
|
|
|
flyspell-not-casechars-cache)
|
|
|
|
(t
|
|
|
|
(setq flyspell-ispell-not-casechars-cache ispell-not-casechars)
|
|
|
|
(setq flyspell-not-casechars-cache ispell-not-casechars)
|
|
|
|
flyspell-not-casechars-cache))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-get-word ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(defun flyspell-get-word (following &optional extra-otherchars)
|
1998-06-26 01:24:05 +00:00
|
|
|
"Return the word for spell-checking according to Ispell syntax.
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
If optional argument FOLLOWING is non-nil or if `flyspell-following-word'
|
1998-06-26 01:24:05 +00:00
|
|
|
is non-nil when called interactively, then the following word
|
|
|
|
\(rather than preceding\) is checked when the cursor is not over a word.
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
Optional second argument contains otherchars that can be included in word
|
1998-06-26 01:24:05 +00:00
|
|
|
many times.
|
|
|
|
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
Word syntax described by `flyspell-dictionary-alist' (which see)."
|
1998-06-26 01:24:05 +00:00
|
|
|
(let* ((flyspell-casechars (flyspell-get-casechars))
|
|
|
|
(flyspell-not-casechars (flyspell-get-not-casechars))
|
|
|
|
(ispell-otherchars (ispell-get-otherchars))
|
|
|
|
(ispell-many-otherchars-p (ispell-get-many-otherchars-p))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(word-regexp (concat flyspell-casechars
|
|
|
|
"+\\("
|
|
|
|
(if (not (string= "" ispell-otherchars))
|
|
|
|
(concat ispell-otherchars "?"))
|
|
|
|
(if extra-otherchars
|
|
|
|
(concat extra-otherchars "?"))
|
|
|
|
flyspell-casechars
|
|
|
|
"+\\)"
|
|
|
|
(if (or ispell-many-otherchars-p
|
|
|
|
extra-otherchars)
|
|
|
|
"*" "?")))
|
|
|
|
did-it-once prevpt
|
1998-06-26 01:24:05 +00:00
|
|
|
start end word)
|
|
|
|
;; find the word
|
2000-07-24 18:36:17 +00:00
|
|
|
(if (not (looking-at flyspell-casechars))
|
1998-06-26 01:24:05 +00:00
|
|
|
(if following
|
2005-12-22 01:51:40 +00:00
|
|
|
(re-search-forward flyspell-casechars nil t)
|
|
|
|
(re-search-backward flyspell-casechars nil t)))
|
1998-06-26 01:24:05 +00:00
|
|
|
;; move to front of word
|
2005-12-22 01:51:40 +00:00
|
|
|
(re-search-backward flyspell-not-casechars nil 'start)
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(while (and (or (and (not (string= "" ispell-otherchars))
|
|
|
|
(looking-at ispell-otherchars))
|
|
|
|
(and extra-otherchars (looking-at extra-otherchars)))
|
|
|
|
(not (bobp))
|
|
|
|
(or (not did-it-once)
|
|
|
|
ispell-many-otherchars-p)
|
|
|
|
(not (eq prevpt (point))))
|
|
|
|
(if (and extra-otherchars (looking-at extra-otherchars))
|
|
|
|
(progn
|
1999-07-12 16:01:16 +00:00
|
|
|
(backward-char 1)
|
|
|
|
(if (looking-at flyspell-casechars)
|
2005-12-22 01:51:40 +00:00
|
|
|
(re-search-backward flyspell-not-casechars nil 'move)))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(setq did-it-once t
|
|
|
|
prevpt (point))
|
|
|
|
(backward-char 1)
|
|
|
|
(if (looking-at flyspell-casechars)
|
2005-12-22 01:51:40 +00:00
|
|
|
(re-search-backward flyspell-not-casechars nil 'move)
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(backward-char -1))))
|
1998-06-26 01:24:05 +00:00
|
|
|
;; Now mark the word and save to string.
|
2005-12-22 01:51:40 +00:00
|
|
|
(if (not (re-search-forward word-regexp nil t))
|
1998-06-26 01:24:05 +00:00
|
|
|
nil
|
|
|
|
(progn
|
|
|
|
(setq start (match-beginning 0)
|
|
|
|
end (point)
|
2001-02-16 15:05:24 +00:00
|
|
|
word (buffer-substring-no-properties start end))
|
1998-06-26 01:24:05 +00:00
|
|
|
(list word start end)))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-small-region ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-small-region (beg end)
|
1998-06-26 01:24:05 +00:00
|
|
|
"Flyspell text between BEG and END."
|
|
|
|
(save-excursion
|
2000-07-24 18:36:17 +00:00
|
|
|
(if (> beg end)
|
|
|
|
(let ((old beg))
|
|
|
|
(setq beg end)
|
|
|
|
(setq end old)))
|
1998-06-26 01:24:05 +00:00
|
|
|
(goto-char beg)
|
1998-06-26 01:27:40 +00:00
|
|
|
(let ((count 0))
|
|
|
|
(while (< (point) end)
|
2002-02-02 15:56:45 +00:00
|
|
|
(if (and flyspell-issue-message-flag (= count 100))
|
1998-06-26 01:27:40 +00:00
|
|
|
(progn
|
|
|
|
(message "Spell Checking...%d%%"
|
1998-08-03 03:27:54 +00:00
|
|
|
(* 100 (/ (float (- (point) beg)) (- end beg))))
|
1998-06-26 01:27:40 +00:00
|
|
|
(setq count 0))
|
|
|
|
(setq count (+ 1 count)))
|
|
|
|
(flyspell-word)
|
2000-07-24 18:36:17 +00:00
|
|
|
(sit-for 0)
|
1998-06-26 01:27:40 +00:00
|
|
|
(let ((cur (point)))
|
|
|
|
(forward-word 1)
|
|
|
|
(if (and (< (point) end) (> (point) (+ cur 1)))
|
|
|
|
(backward-char 1)))))
|
1998-06-26 01:24:05 +00:00
|
|
|
(backward-char 1)
|
2002-02-02 15:56:45 +00:00
|
|
|
(if flyspell-issue-message-flag (message "Spell Checking completed."))
|
1998-06-26 01:24:05 +00:00
|
|
|
(flyspell-word)))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-external-ispell-process ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defvar flyspell-external-ispell-process '()
|
2001-01-26 18:52:53 +00:00
|
|
|
"The external Flyspell Ispell process.")
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-external-ispell-buffer ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defvar flyspell-external-ispell-buffer '())
|
|
|
|
(defvar flyspell-large-region-buffer '())
|
|
|
|
(defvar flyspell-large-region-beg (point-min))
|
|
|
|
(defvar flyspell-large-region-end (point-max))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-external-point-words ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-external-point-words ()
|
2005-10-10 01:14:28 +00:00
|
|
|
"Mark words from a buffer listing incorrect words in order of appearance.
|
|
|
|
The list of incorrect words should be in `flyspell-external-ispell-buffer'.
|
|
|
|
\(We finish by killing that buffer and setting the variable to nil.)
|
|
|
|
The buffer to mark them in is `flyspell-large-region-buffer'."
|
2005-12-02 13:17:38 +00:00
|
|
|
(let (words-not-found
|
2005-12-27 22:49:46 +00:00
|
|
|
(ispell-otherchars (ispell-get-otherchars))
|
2006-03-03 11:49:22 +00:00
|
|
|
(buffer-scan-pos flyspell-large-region-beg)
|
2006-03-11 15:07:32 +00:00
|
|
|
case-fold-search)
|
2005-12-02 13:17:38 +00:00
|
|
|
(with-current-buffer flyspell-external-ispell-buffer
|
|
|
|
(goto-char (point-min))
|
2005-12-27 22:49:46 +00:00
|
|
|
;; Loop over incorrect words, in the order they were reported,
|
|
|
|
;; which is also the order they appear in the buffer being checked.
|
2005-12-22 01:51:40 +00:00
|
|
|
(while (re-search-forward "\\([^\n]+\\)\n" nil t)
|
2005-12-02 13:17:38 +00:00
|
|
|
;; Bind WORD to the next one.
|
|
|
|
(let ((word (match-string 1)) (wordpos (point)))
|
|
|
|
;; Here there used to be code to see if WORD is the same
|
|
|
|
;; as the previous iteration, and count the number of consecutive
|
|
|
|
;; identical words, and the loop below would search for that many.
|
|
|
|
;; That code seemed to be incorrect, and on principle, should
|
|
|
|
;; be unnecessary too. -- rms.
|
|
|
|
(if flyspell-issue-message-flag
|
|
|
|
(message "Spell Checking...%d%% [%s]"
|
|
|
|
(* 100 (/ (float (point)) (point-max)))
|
|
|
|
word))
|
|
|
|
(with-current-buffer flyspell-large-region-buffer
|
2005-12-27 22:49:46 +00:00
|
|
|
(goto-char buffer-scan-pos)
|
2005-12-02 13:17:38 +00:00
|
|
|
(let ((keep t))
|
|
|
|
;; Iterate on string search until string is found as word,
|
|
|
|
;; not as substring
|
|
|
|
(while keep
|
|
|
|
(if (search-forward word
|
|
|
|
flyspell-large-region-end t)
|
2005-12-27 22:49:46 +00:00
|
|
|
(let* ((found-list
|
|
|
|
(save-excursion
|
|
|
|
;; Move back into the match
|
|
|
|
;; so flyspell-get-word will find it.
|
|
|
|
(forward-char -1)
|
|
|
|
(flyspell-get-word nil)))
|
|
|
|
(found (car found-list))
|
|
|
|
(found-length (length found))
|
|
|
|
(misspell-length (length word)))
|
|
|
|
(when (or
|
|
|
|
;; Size matches, we really found it.
|
|
|
|
(= found-length misspell-length)
|
|
|
|
;; Matches as part of a boundary-char separated word
|
|
|
|
(member word
|
|
|
|
(split-string found ispell-otherchars))
|
|
|
|
;; Misspelling has higher length than
|
|
|
|
;; what flyspell considers the
|
|
|
|
;; word. Caused by boundary-chars
|
|
|
|
;; mismatch. Validating seems safe.
|
|
|
|
(< found-length misspell-length)
|
|
|
|
;; ispell treats beginning of some TeX
|
|
|
|
;; commands as nroff control sequences
|
|
|
|
;; and strips them in the list of
|
|
|
|
;; misspelled words thus giving a
|
|
|
|
;; non-existent word. Skip if ispell
|
|
|
|
;; is used, string is a TeX command
|
|
|
|
;; (char before beginning of word is
|
|
|
|
;; backslash) and none of the previous
|
|
|
|
;; contitions match
|
|
|
|
(and (not ispell-really-aspell)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (- (nth 1 found-list) 1))
|
|
|
|
(if (looking-at "[\\]" )
|
|
|
|
t
|
|
|
|
nil))))
|
|
|
|
(setq keep nil)
|
|
|
|
(flyspell-word)
|
|
|
|
;; Search for next misspelled word will begin from
|
|
|
|
;; end of last validated match.
|
|
|
|
(setq buffer-scan-pos (point))))
|
2005-12-02 13:17:38 +00:00
|
|
|
;; Record if misspelling is not found and try new one
|
|
|
|
(add-to-list 'words-not-found
|
|
|
|
(concat " -> " word " - "
|
|
|
|
(int-to-string wordpos)))
|
|
|
|
(setq keep nil)))))))
|
|
|
|
;; we are done
|
|
|
|
(if flyspell-issue-message-flag (message "Spell Checking completed.")))
|
|
|
|
;; Warn about not found misspellings
|
|
|
|
(dolist (word words-not-found)
|
|
|
|
(message "%s: word not found" word))
|
|
|
|
;; Kill and forget the buffer with the list of incorrect words.
|
|
|
|
(kill-buffer flyspell-external-ispell-buffer)
|
|
|
|
(setq flyspell-external-ispell-buffer nil)))
|
2002-01-29 13:42:12 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-process-localwords ... */
|
|
|
|
;;* ------------------------------------------------------------- */
|
|
|
|
;;* This function is used to prevent marking of words explicitly */
|
|
|
|
;;* declared correct. */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2005-11-14 04:53:14 +00:00
|
|
|
(defun flyspell-process-localwords (misspellings-buffer)
|
2006-03-11 15:07:32 +00:00
|
|
|
(let (localwords case-fold-search
|
2005-11-14 04:53:14 +00:00
|
|
|
(ispell-casechars (ispell-get-casechars)))
|
|
|
|
;; Get localwords from the original buffer
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
;; Localwords parsing copied from ispell.el.
|
|
|
|
(while (search-forward ispell-words-keyword nil t)
|
|
|
|
(let ((end (save-excursion (end-of-line) (point)))
|
|
|
|
string)
|
|
|
|
;; buffer-local words separated by a space, and can contain
|
|
|
|
;; any character other than a space. Not rigorous enough.
|
|
|
|
(while (re-search-forward " *\\([^ ]+\\)" end t)
|
|
|
|
(setq string (buffer-substring-no-properties (match-beginning 1)
|
|
|
|
(match-end 1)))
|
|
|
|
;; This can fail when string contains a word with invalid chars.
|
|
|
|
;; Error handling needs to be added between Ispell and Emacs.
|
2005-12-02 13:17:38 +00:00
|
|
|
(if (and (< 1 (length string))
|
2005-11-14 04:53:14 +00:00
|
|
|
(equal 0 (string-match ispell-casechars string)))
|
|
|
|
(push string localwords))))))
|
|
|
|
;; Remove localwords matches from misspellings-buffer.
|
|
|
|
;; The usual mechanism of communicating the local words to ispell
|
|
|
|
;; does not affect the special ispell process used by
|
|
|
|
;; flyspell-large-region.
|
|
|
|
(with-current-buffer misspellings-buffer
|
|
|
|
(save-excursion
|
|
|
|
(dolist (word localwords)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(let ((regexp (concat "^" word "\n")))
|
|
|
|
(while (re-search-forward regexp nil t)
|
|
|
|
(delete-region (match-beginning 0) (match-end 0)))))))))
|
|
|
|
|
2006-09-16 15:05:47 +00:00
|
|
|
;;* ---------------------------------------------------------------
|
|
|
|
;;* flyspell-check-region-doublons
|
|
|
|
;;* ---------------------------------------------------------------
|
|
|
|
(defun flyspell-check-region-doublons (beg end)
|
|
|
|
"Check for adjacent duplicated words (doublons) in the given region."
|
|
|
|
(save-excursion
|
|
|
|
(goto-char beg)
|
|
|
|
(flyspell-word) ; Make sure current word is checked
|
|
|
|
(backward-word 1)
|
|
|
|
(while (and (< (point) end)
|
2006-10-23 13:59:44 +00:00
|
|
|
(re-search-forward "\\<\\(\\w+\\)\\>[ \n\t\f]+\\1\\>"
|
2006-09-16 15:05:47 +00:00
|
|
|
end 'move))
|
|
|
|
(flyspell-word)
|
|
|
|
(backward-word 1))
|
|
|
|
(flyspell-word)))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-large-region ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-large-region (beg end)
|
|
|
|
(let* ((curbuf (current-buffer))
|
|
|
|
(buffer (get-buffer-create "*flyspell-region*")))
|
|
|
|
(setq flyspell-external-ispell-buffer buffer)
|
|
|
|
(setq flyspell-large-region-buffer curbuf)
|
|
|
|
(setq flyspell-large-region-beg beg)
|
|
|
|
(setq flyspell-large-region-end end)
|
2005-11-14 04:53:14 +00:00
|
|
|
(flyspell-accept-buffer-local-defs)
|
2000-07-24 18:36:17 +00:00
|
|
|
(set-buffer buffer)
|
|
|
|
(erase-buffer)
|
2001-03-26 16:31:20 +00:00
|
|
|
;; this is done, we can start checking...
|
2002-02-02 15:56:45 +00:00
|
|
|
(if flyspell-issue-message-flag (message "Checking region..."))
|
2000-07-24 18:36:17 +00:00
|
|
|
(set-buffer curbuf)
|
2008-04-23 20:39:10 +00:00
|
|
|
(ispell-set-spellchecker-params) ; Initialize variables and dicts alists
|
2007-12-02 18:18:19 +00:00
|
|
|
;; Local dictionary becomes the global dictionary in use.
|
|
|
|
(setq ispell-current-dictionary
|
|
|
|
(or ispell-local-dictionary ispell-dictionary))
|
|
|
|
(setq ispell-current-personal-dictionary
|
|
|
|
(or ispell-local-pdict ispell-personal-dictionary))
|
|
|
|
(let ((args (ispell-get-ispell-args))
|
|
|
|
(encoding (ispell-get-coding-system))
|
|
|
|
c)
|
|
|
|
(if (and ispell-current-dictionary ; use specified dictionary
|
|
|
|
(not (member "-d" args))) ; only define if not overridden
|
|
|
|
(setq args
|
|
|
|
(append (list "-d" ispell-current-dictionary) args)))
|
|
|
|
(if ispell-current-personal-dictionary ; use specified pers dict
|
|
|
|
(setq args
|
|
|
|
(append args
|
|
|
|
(list "-p"
|
|
|
|
(expand-file-name
|
|
|
|
ispell-current-personal-dictionary)))))
|
|
|
|
(setq args (append args ispell-extra-args))
|
2008-12-18 18:44:31 +00:00
|
|
|
|
|
|
|
;; If we are using recent aspell or hunspell, make sure we use the right encoding
|
|
|
|
;; for communication. ispell or older aspell/hunspell does not support this
|
2009-01-08 18:46:23 +00:00
|
|
|
(if ispell-encoding8-command
|
2007-12-02 18:18:19 +00:00
|
|
|
(setq args
|
|
|
|
(append args
|
|
|
|
(list
|
2009-01-08 18:46:23 +00:00
|
|
|
(concat ispell-encoding8-command
|
2007-12-02 18:18:19 +00:00
|
|
|
(symbol-name
|
|
|
|
encoding))))))
|
2008-12-18 18:44:31 +00:00
|
|
|
|
2007-12-02 18:18:19 +00:00
|
|
|
(let ((process-coding-system-alist (list (cons "\\.*" encoding))))
|
|
|
|
(setq c (apply 'ispell-call-process-region beg
|
|
|
|
end
|
|
|
|
ispell-program-name
|
|
|
|
nil
|
|
|
|
buffer
|
|
|
|
nil
|
|
|
|
(if ispell-really-aspell "list" "-l")
|
|
|
|
args)))
|
2004-01-03 12:12:01 +00:00
|
|
|
(if (eq c 0)
|
2005-11-14 04:53:14 +00:00
|
|
|
(progn
|
|
|
|
(flyspell-process-localwords buffer)
|
|
|
|
(with-current-buffer curbuf
|
2006-09-16 15:05:47 +00:00
|
|
|
(flyspell-delete-region-overlays beg end)
|
|
|
|
(flyspell-check-region-doublons beg end))
|
2005-11-14 04:53:14 +00:00
|
|
|
(flyspell-external-point-words))
|
2000-07-24 18:36:17 +00:00
|
|
|
(error "Can't check region...")))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-region ... */
|
|
|
|
;;* ------------------------------------------------------------- */
|
|
|
|
;;* Because `ispell -a' is too slow, it is not possible to use */
|
|
|
|
;;* it on large region. Then, when ispell is invoked on a large */
|
|
|
|
;;* text region, a new `ispell -l' process is spawned. The */
|
|
|
|
;;* pointed out words are then searched in the region a checked with */
|
|
|
|
;;* regular flyspell means. */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2001-02-16 13:21:11 +00:00
|
|
|
;;;###autoload
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-region (beg end)
|
|
|
|
"Flyspell text between BEG and END."
|
|
|
|
(interactive "r")
|
2008-04-23 20:39:10 +00:00
|
|
|
(ispell-set-spellchecker-params) ; Initialize variables and dicts alists
|
2000-07-24 18:36:17 +00:00
|
|
|
(if (= beg end)
|
|
|
|
()
|
|
|
|
(save-excursion
|
|
|
|
(if (> beg end)
|
|
|
|
(let ((old beg))
|
|
|
|
(setq beg end)
|
|
|
|
(setq end old)))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(if (and flyspell-large-region (> (- end beg) flyspell-large-region))
|
2000-07-24 18:36:17 +00:00
|
|
|
(flyspell-large-region beg end)
|
|
|
|
(flyspell-small-region beg end)))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-buffer ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2001-02-16 13:21:11 +00:00
|
|
|
;;;###autoload
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-buffer ()
|
|
|
|
"Flyspell whole buffer."
|
|
|
|
(interactive)
|
|
|
|
(flyspell-region (point-min) (point-max)))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* old next error position ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defvar flyspell-old-buffer-error nil)
|
|
|
|
(defvar flyspell-old-pos-error nil)
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-goto-next-error ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-goto-next-error ()
|
|
|
|
"Go to the next previously detected error.
|
|
|
|
In general FLYSPELL-GOTO-NEXT-ERROR must be used after
|
|
|
|
FLYSPELL-BUFFER."
|
|
|
|
(interactive)
|
|
|
|
(let ((pos (point))
|
|
|
|
(max (point-max)))
|
|
|
|
(if (and (eq (current-buffer) flyspell-old-buffer-error)
|
|
|
|
(eq pos flyspell-old-pos-error))
|
|
|
|
(progn
|
|
|
|
(if (= flyspell-old-pos-error max)
|
|
|
|
;; goto beginning of buffer
|
|
|
|
(progn
|
|
|
|
(message "Restarting from beginning of buffer")
|
|
|
|
(goto-char (point-min)))
|
|
|
|
(forward-word 1))
|
|
|
|
(setq pos (point))))
|
|
|
|
;; seek the next error
|
|
|
|
(while (and (< pos max)
|
|
|
|
(let ((ovs (overlays-at pos))
|
|
|
|
(r '()))
|
|
|
|
(while (and (not r) (consp ovs))
|
|
|
|
(if (flyspell-overlay-p (car ovs))
|
|
|
|
(setq r t)
|
|
|
|
(setq ovs (cdr ovs))))
|
|
|
|
(not r)))
|
|
|
|
(setq pos (1+ pos)))
|
2001-03-26 16:31:20 +00:00
|
|
|
;; save the current location for next invocation
|
2000-07-24 18:36:17 +00:00
|
|
|
(setq flyspell-old-pos-error pos)
|
|
|
|
(setq flyspell-old-buffer-error (current-buffer))
|
|
|
|
(goto-char pos)
|
|
|
|
(if (= pos max)
|
|
|
|
(message "No more miss-spelled word!"))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-overlay-p ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-overlay-p (o)
|
2007-08-08 07:27:21 +00:00
|
|
|
"Return true if O is an overlay used by flyspell."
|
1998-06-26 01:24:05 +00:00
|
|
|
(and (overlayp o) (overlay-get o 'flyspell-overlay)))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-delete-region-overlays, flyspell-delete-all-overlays */
|
|
|
|
;;* ------------------------------------------------------------- */
|
|
|
|
;;* Remove overlays introduced by flyspell. */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2005-11-14 04:53:14 +00:00
|
|
|
(defun flyspell-delete-region-overlays (beg end)
|
|
|
|
"Delete overlays used by flyspell in a given region."
|
2005-11-16 16:07:47 +00:00
|
|
|
(remove-overlays beg end 'flyspell-overlay t))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-14 04:53:14 +00:00
|
|
|
|
|
|
|
(defun flyspell-delete-all-overlays ()
|
|
|
|
"Delete all the overlays used by flyspell."
|
2005-12-16 02:02:42 +00:00
|
|
|
(remove-overlays (point-min) (point-max) 'flyspell-overlay t))
|
2005-11-14 04:53:14 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-unhighlight-at ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-unhighlight-at (pos)
|
|
|
|
"Remove the flyspell overlay that are located at POS."
|
|
|
|
(if flyspell-persistent-highlight
|
|
|
|
(let ((overlays (overlays-at pos)))
|
|
|
|
(while (consp overlays)
|
|
|
|
(if (flyspell-overlay-p (car overlays))
|
|
|
|
(delete-overlay (car overlays)))
|
|
|
|
(setq overlays (cdr overlays))))
|
2000-07-24 18:36:17 +00:00
|
|
|
(if (flyspell-overlay-p flyspell-overlay)
|
2005-11-16 17:00:29 +00:00
|
|
|
(delete-overlay flyspell-overlay))))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-properties-at-p ... */
|
|
|
|
;;* ------------------------------------------------------------- */
|
|
|
|
;;* Is there an highlight properties at position pos? */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-08-03 03:27:54 +00:00
|
|
|
(defun flyspell-properties-at-p (pos)
|
|
|
|
"Return t if there is a text property at POS, not counting `local-map'.
|
|
|
|
If variable `flyspell-highlight-properties' is set to nil,
|
|
|
|
text with properties are not checked. This function is used to discover
|
|
|
|
if the character at POS has any other property."
|
|
|
|
(let ((prop (text-properties-at pos))
|
1998-06-26 01:24:05 +00:00
|
|
|
(keep t))
|
|
|
|
(while (and keep (consp prop))
|
|
|
|
(if (and (eq (car prop) 'local-map) (consp (cdr prop)))
|
|
|
|
(setq prop (cdr (cdr prop)))
|
|
|
|
(setq keep nil)))
|
|
|
|
(consp prop)))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* make-flyspell-overlay ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun make-flyspell-overlay (beg end face mouse-face)
|
1998-07-29 03:21:32 +00:00
|
|
|
"Allocate an overlay to highlight an incorrect word.
|
|
|
|
BEG and END specify the range in the buffer of that word.
|
|
|
|
FACE and MOUSE-FACE specify the `face' and `mouse-face' properties
|
|
|
|
for the overlay."
|
2005-11-16 17:00:29 +00:00
|
|
|
(let ((overlay (make-overlay beg end nil t nil)))
|
|
|
|
(overlay-put overlay 'face face)
|
|
|
|
(overlay-put overlay 'mouse-face mouse-face)
|
|
|
|
(overlay-put overlay 'flyspell-overlay t)
|
|
|
|
(overlay-put overlay 'evaporate t)
|
|
|
|
(overlay-put overlay 'help-echo "mouse-2: correct word at point")
|
|
|
|
(overlay-put overlay 'keymap flyspell-mouse-map)
|
2005-06-10 10:46:38 +00:00
|
|
|
(when (eq face 'flyspell-incorrect)
|
2002-02-02 15:56:45 +00:00
|
|
|
(and (stringp flyspell-before-incorrect-word-string)
|
2005-11-16 17:00:29 +00:00
|
|
|
(overlay-put overlay 'before-string
|
2002-02-02 15:56:45 +00:00
|
|
|
flyspell-before-incorrect-word-string))
|
|
|
|
(and (stringp flyspell-after-incorrect-word-string)
|
2005-11-16 17:00:29 +00:00
|
|
|
(overlay-put overlay 'after-string
|
2002-02-02 15:56:45 +00:00
|
|
|
flyspell-after-incorrect-word-string)))
|
2005-11-16 17:00:29 +00:00
|
|
|
overlay))
|
2002-01-29 13:42:12 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-highlight-incorrect-region ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-highlight-incorrect-region (beg end poss)
|
2005-09-23 18:29:20 +00:00
|
|
|
"Set up an overlay on a misspelled word, in the buffer from BEG to END.
|
|
|
|
POSS is usually a list of possible spelling/correction lists,
|
|
|
|
as returned by `ispell-parse-output'.
|
|
|
|
It can also be the symbol `doublon', in the case where the word
|
|
|
|
is itself incorrect, but suspiciously repeated."
|
2004-05-08 12:48:49 +00:00
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(unless (run-hook-with-args-until-success
|
|
|
|
'flyspell-incorrect-hook beg end poss)
|
|
|
|
(if (or flyspell-highlight-properties
|
|
|
|
(not (flyspell-properties-at-p beg)))
|
|
|
|
(progn
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
;; we cleanup all the overlay that are in the region, not
|
|
|
|
;; beginning at the word start position
|
|
|
|
(if (< (1+ beg) end)
|
|
|
|
(let ((os (overlays-in (1+ beg) end)))
|
|
|
|
(while (consp os)
|
|
|
|
(if (flyspell-overlay-p (car os))
|
|
|
|
(delete-overlay (car os)))
|
|
|
|
(setq os (cdr os)))))
|
2004-05-08 12:48:49 +00:00
|
|
|
;; we cleanup current overlay at the same position
|
2005-11-16 17:00:29 +00:00
|
|
|
(flyspell-unhighlight-at beg)
|
2004-05-08 12:48:49 +00:00
|
|
|
;; now we can use a new overlay
|
|
|
|
(setq flyspell-overlay
|
|
|
|
(make-flyspell-overlay
|
2006-10-22 21:29:33 +00:00
|
|
|
beg end
|
|
|
|
(if (eq poss 'doublon) 'flyspell-duplicate 'flyspell-incorrect)
|
|
|
|
'highlight)))))))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-highlight-duplicate-region ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2004-08-22 17:15:55 +00:00
|
|
|
(defun flyspell-highlight-duplicate-region (beg end poss)
|
2005-09-23 18:29:20 +00:00
|
|
|
"Set up an overlay on a duplicate misspelled word, in the buffer from BEG to END.
|
|
|
|
POSS is a list of possible spelling/correction lists,
|
|
|
|
as returned by `ispell-parse-output'."
|
2004-05-08 12:48:49 +00:00
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(unless (run-hook-with-args-until-success
|
|
|
|
'flyspell-incorrect-hook beg end poss)
|
|
|
|
(if (or flyspell-highlight-properties
|
|
|
|
(not (flyspell-properties-at-p beg)))
|
|
|
|
(progn
|
|
|
|
;; we cleanup current overlay at the same position
|
2005-11-16 17:00:29 +00:00
|
|
|
(flyspell-unhighlight-at beg)
|
2004-05-08 12:48:49 +00:00
|
|
|
;; now we can use a new overlay
|
|
|
|
(setq flyspell-overlay
|
|
|
|
(make-flyspell-overlay beg end
|
2005-06-10 10:46:38 +00:00
|
|
|
'flyspell-duplicate
|
2004-05-08 12:48:49 +00:00
|
|
|
'highlight)))))))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-auto-correct-cache ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-06-26 01:24:05 +00:00
|
|
|
(defvar flyspell-auto-correct-pos nil)
|
|
|
|
(defvar flyspell-auto-correct-region nil)
|
|
|
|
(defvar flyspell-auto-correct-ring nil)
|
2000-07-24 18:36:17 +00:00
|
|
|
(defvar flyspell-auto-correct-word nil)
|
|
|
|
(make-variable-buffer-local 'flyspell-auto-correct-pos)
|
|
|
|
(make-variable-buffer-local 'flyspell-auto-correct-region)
|
|
|
|
(make-variable-buffer-local 'flyspell-auto-correct-ring)
|
|
|
|
(make-variable-buffer-local 'flyspell-auto-correct-word)
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-check-previous-highlighted-word ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-check-previous-highlighted-word (&optional arg)
|
2001-03-26 16:31:20 +00:00
|
|
|
"Correct the closer misspelled word.
|
2000-07-24 18:36:17 +00:00
|
|
|
This function scans a mis-spelled word before the cursor. If it finds one
|
|
|
|
it proposes replacement for that word. With prefix arg, count that many
|
|
|
|
misspelled words backwards."
|
|
|
|
(interactive)
|
|
|
|
(let ((pos1 (point))
|
|
|
|
(pos (point))
|
|
|
|
(arg (if (or (not (numberp arg)) (< arg 1)) 1 arg))
|
|
|
|
ov ovs)
|
|
|
|
(if (catch 'exit
|
|
|
|
(while (and (setq pos (previous-overlay-change pos))
|
|
|
|
(not (= pos pos1)))
|
|
|
|
(setq pos1 pos)
|
|
|
|
(if (> pos (point-min))
|
|
|
|
(progn
|
|
|
|
(setq ovs (overlays-at (1- pos)))
|
|
|
|
(while (consp ovs)
|
|
|
|
(setq ov (car ovs))
|
|
|
|
(setq ovs (cdr ovs))
|
2005-11-16 17:00:29 +00:00
|
|
|
(if (and (flyspell-overlay-p ov)
|
2000-07-24 18:36:17 +00:00
|
|
|
(= 0 (setq arg (1- arg))))
|
|
|
|
(throw 'exit t)))))))
|
1998-06-26 01:24:05 +00:00
|
|
|
(save-excursion
|
2000-07-24 18:36:17 +00:00
|
|
|
(goto-char pos)
|
|
|
|
(ispell-word))
|
2001-01-26 18:52:53 +00:00
|
|
|
(error "No word to correct before point"))))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-display-next-corrections ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-display-next-corrections (corrections)
|
|
|
|
(let ((string "Corrections:")
|
|
|
|
(l corrections)
|
|
|
|
(pos '()))
|
|
|
|
(while (< (length string) 80)
|
|
|
|
(if (equal (car l) flyspell-auto-correct-word)
|
|
|
|
(setq pos (cons (+ 1 (length string)) pos)))
|
|
|
|
(setq string (concat string " " (car l)))
|
|
|
|
(setq l (cdr l)))
|
|
|
|
(while (consp pos)
|
|
|
|
(let ((num (car pos)))
|
|
|
|
(put-text-property num
|
|
|
|
(+ num (length flyspell-auto-correct-word))
|
2005-06-10 10:46:38 +00:00
|
|
|
'face 'flyspell-incorrect
|
2000-07-24 18:36:17 +00:00
|
|
|
string))
|
|
|
|
(setq pos (cdr pos)))
|
|
|
|
(if (fboundp 'display-message)
|
|
|
|
(display-message 'no-log string)
|
2005-09-18 12:28:30 +00:00
|
|
|
(message "%s" string))))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-abbrev-table ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-abbrev-table ()
|
|
|
|
(if flyspell-use-global-abbrev-table-p
|
|
|
|
global-abbrev-table
|
2003-12-29 20:06:19 +00:00
|
|
|
(or local-abbrev-table global-abbrev-table)))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-define-abbrev ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2002-02-02 15:56:45 +00:00
|
|
|
(defun flyspell-define-abbrev (name expansion)
|
|
|
|
(let ((table (flyspell-abbrev-table)))
|
|
|
|
(when table
|
2007-04-22 00:22:14 +00:00
|
|
|
(define-abbrev table (downcase name) expansion))))
|
2002-02-02 15:56:45 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-auto-correct-word ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-auto-correct-word ()
|
|
|
|
"Correct the current word.
|
|
|
|
This command proposes various successive corrections for the current word."
|
|
|
|
(interactive)
|
|
|
|
(let ((pos (point))
|
|
|
|
(old-max (point-max)))
|
|
|
|
;; use the correct dictionary
|
|
|
|
(flyspell-accept-buffer-local-defs)
|
|
|
|
(if (and (eq flyspell-auto-correct-pos pos)
|
|
|
|
(consp flyspell-auto-correct-region))
|
|
|
|
;; we have already been using the function at the same location
|
|
|
|
(let* ((start (car flyspell-auto-correct-region))
|
|
|
|
(len (cdr flyspell-auto-correct-region)))
|
2002-02-02 15:56:45 +00:00
|
|
|
(flyspell-unhighlight-at start)
|
2000-07-24 18:36:17 +00:00
|
|
|
(delete-region start (+ start len))
|
|
|
|
(setq flyspell-auto-correct-ring (cdr flyspell-auto-correct-ring))
|
|
|
|
(let* ((word (car flyspell-auto-correct-ring))
|
|
|
|
(len (length word)))
|
|
|
|
(rplacd flyspell-auto-correct-region len)
|
|
|
|
(goto-char start)
|
|
|
|
(if flyspell-abbrev-p
|
|
|
|
(if (flyspell-already-abbrevp (flyspell-abbrev-table)
|
|
|
|
flyspell-auto-correct-word)
|
|
|
|
(flyspell-change-abbrev (flyspell-abbrev-table)
|
|
|
|
flyspell-auto-correct-word
|
|
|
|
word)
|
2002-02-02 15:56:45 +00:00
|
|
|
(flyspell-define-abbrev flyspell-auto-correct-word word)))
|
|
|
|
(funcall flyspell-insert-function word)
|
2000-07-24 18:36:17 +00:00
|
|
|
(flyspell-word)
|
|
|
|
(flyspell-display-next-corrections flyspell-auto-correct-ring))
|
|
|
|
(flyspell-ajust-cursor-point pos (point) old-max)
|
|
|
|
(setq flyspell-auto-correct-pos (point)))
|
|
|
|
;; fetch the word to be checked
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(let ((word (flyspell-get-word nil)))
|
|
|
|
(if (consp word)
|
|
|
|
(let ((start (car (cdr word)))
|
|
|
|
(end (car (cdr (cdr word))))
|
|
|
|
(word (car word))
|
2006-09-14 01:19:38 +00:00
|
|
|
poss ispell-filter)
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(setq flyspell-auto-correct-word word)
|
|
|
|
;; now check spelling of word.
|
2005-11-16 17:00:29 +00:00
|
|
|
(ispell-send-string "%\n") ;put in verbose mode
|
|
|
|
(ispell-send-string (concat "^" word "\n"))
|
|
|
|
;; wait until ispell has processed word.
|
|
|
|
(while (progn
|
|
|
|
(accept-process-output ispell-process)
|
|
|
|
(not (string= "" (car ispell-filter)))))
|
2006-09-14 01:19:38 +00:00
|
|
|
;; Remove leading empty element
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(setq ispell-filter (cdr ispell-filter))
|
2006-09-14 01:19:38 +00:00
|
|
|
;; ispell process should return something after word is sent.
|
|
|
|
;; Tag word as valid (i.e., skip) otherwise
|
|
|
|
(or ispell-filter
|
|
|
|
(setq ispell-filter '(*)))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(if (consp ispell-filter)
|
|
|
|
(setq poss (ispell-parse-output (car ispell-filter))))
|
|
|
|
(cond
|
|
|
|
((or (eq poss t) (stringp poss))
|
|
|
|
;; don't correct word
|
|
|
|
t)
|
|
|
|
((null poss)
|
|
|
|
;; ispell error
|
|
|
|
(error "Ispell: error in Ispell process"))
|
|
|
|
(t
|
|
|
|
;; the word is incorrect, we have to propose a replacement
|
|
|
|
(let ((replacements (if flyspell-sort-corrections
|
|
|
|
(sort (car (cdr (cdr poss))) 'string<)
|
|
|
|
(car (cdr (cdr poss))))))
|
|
|
|
(setq flyspell-auto-correct-region nil)
|
|
|
|
(if (consp replacements)
|
|
|
|
(progn
|
|
|
|
(let ((replace (car replacements)))
|
|
|
|
(let ((new-word replace))
|
|
|
|
(if (not (equal new-word (car poss)))
|
|
|
|
(progn
|
|
|
|
;; the save the current replacements
|
|
|
|
(setq flyspell-auto-correct-region
|
|
|
|
(cons start (length new-word)))
|
|
|
|
(let ((l replacements))
|
|
|
|
(while (consp (cdr l))
|
|
|
|
(setq l (cdr l)))
|
|
|
|
(rplacd l (cons (car poss) replacements)))
|
|
|
|
(setq flyspell-auto-correct-ring
|
|
|
|
replacements)
|
|
|
|
(flyspell-unhighlight-at start)
|
|
|
|
(delete-region start end)
|
|
|
|
(funcall flyspell-insert-function new-word)
|
|
|
|
(if flyspell-abbrev-p
|
|
|
|
(if (flyspell-already-abbrevp
|
|
|
|
(flyspell-abbrev-table) word)
|
|
|
|
(flyspell-change-abbrev
|
|
|
|
(flyspell-abbrev-table)
|
|
|
|
word
|
|
|
|
new-word)
|
|
|
|
(flyspell-define-abbrev word
|
|
|
|
new-word)))
|
|
|
|
(flyspell-word)
|
|
|
|
(flyspell-display-next-corrections
|
|
|
|
(cons new-word flyspell-auto-correct-ring))
|
|
|
|
(flyspell-ajust-cursor-point pos
|
|
|
|
(point)
|
|
|
|
old-max))))))))))
|
|
|
|
(setq flyspell-auto-correct-pos (point))
|
|
|
|
(ispell-pdict-save t)))))))
|
2002-01-29 13:42:12 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-auto-correct-previous-pos ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2002-02-02 15:56:45 +00:00
|
|
|
(defvar flyspell-auto-correct-previous-pos nil
|
|
|
|
"Holds the start of the first incorrect word before point.")
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-auto-correct-previous-hook ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2002-02-02 15:56:45 +00:00
|
|
|
(defun flyspell-auto-correct-previous-hook ()
|
|
|
|
"Hook to track successive calls to `flyspell-auto-correct-previous-word'.
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
Sets `flyspell-auto-correct-previous-pos' to nil"
|
2005-06-14 11:36:04 +00:00
|
|
|
(interactive)
|
2002-02-02 15:56:45 +00:00
|
|
|
(remove-hook 'pre-command-hook (function flyspell-auto-correct-previous-hook) t)
|
|
|
|
(unless (eq this-command (function flyspell-auto-correct-previous-word))
|
|
|
|
(setq flyspell-auto-correct-previous-pos nil)))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-auto-correct-previous-word ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2005-06-14 11:36:04 +00:00
|
|
|
(defun flyspell-auto-correct-previous-word (position)
|
2005-11-16 17:00:29 +00:00
|
|
|
"Auto correct the first mispelled word that occurs before point.
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
But don't look beyond what's visible on the screen."
|
2002-02-02 15:56:45 +00:00
|
|
|
(interactive "d")
|
|
|
|
|
2007-04-27 18:53:31 +00:00
|
|
|
(let ((top (window-start))
|
|
|
|
(bot (window-end)))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region top bot)
|
|
|
|
(overlay-recenter (point))
|
|
|
|
|
2005-06-14 11:36:04 +00:00
|
|
|
(add-hook 'pre-command-hook
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(function flyspell-auto-correct-previous-hook) t t)
|
|
|
|
|
|
|
|
(unless flyspell-auto-correct-previous-pos
|
|
|
|
;; only reset if a new overlay exists
|
|
|
|
(setq flyspell-auto-correct-previous-pos nil)
|
2005-06-14 11:36:04 +00:00
|
|
|
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(let ((overlay-list (overlays-in (point-min) position))
|
|
|
|
(new-overlay 'dummy-value))
|
2005-06-14 11:36:04 +00:00
|
|
|
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
;; search for previous (new) flyspell overlay
|
|
|
|
(while (and new-overlay
|
|
|
|
(or (not (flyspell-overlay-p new-overlay))
|
|
|
|
;; check if its face has changed
|
2005-06-14 11:36:04 +00:00
|
|
|
(not (eq (get-char-property
|
|
|
|
(overlay-start new-overlay) 'face)
|
2005-06-10 10:46:38 +00:00
|
|
|
'flyspell-incorrect))))
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(setq new-overlay (car-safe overlay-list))
|
|
|
|
(setq overlay-list (cdr-safe overlay-list)))
|
2005-06-14 11:36:04 +00:00
|
|
|
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
;; if nothing new exits new-overlay should be nil
|
|
|
|
(if new-overlay ;; the length of the word may change so go to the start
|
2005-06-14 11:36:04 +00:00
|
|
|
(setq flyspell-auto-correct-previous-pos
|
(flyspell-version): Function deleted.
(flyspell-auto-correct-previous-hook): Doc fix.
(flyspell-emacs, flyspell-use-local-map): Vars moved up.
(flyspell-default-delayed-commands): add backward-delete-char-untabify.
(flyspell-abbrev-p): Default to nil.
(flyspell-use-global-abbrev-table-p): Doc fix.
(flyspell-large-region): Allow nil as value.
(flyspell-use-meta-tab, flyspell-auto-correct-binding): New variables.
(mail-mode-flyspell-verify): More robust handling
of `mail-header-separator'. More efficient signature detection.
Allow for regexp metacharacters in message-header-separator.
Adding `To' not to be checked in mail-mode-flyspell-verify.
(flyspell-prog-mode): Run flyspell-prog-mode-hook.
(flyspell-mouse-map, flyspell-mode-map): Bind C-. and C-, .
Bind M-TAB only if flyspell-use-meta-tab.
Bind flyspell-auto-correct-binding.
(flyspell-mode-on): Bind flyspell-mouse-map and flyspell-mode-map.
(flyspell-mode): Doc fix.
(flyspell-accept-buffer-local-defs): Preserve current buffer.
(flyspell-word-cache-result): New var, always local.
(flyspell-check-pre-word-p): Doc fix.
(flyspell-check-changed-word-p): Handle spc like newline.
(flyspell-post-command-hook): Set flyspell-word-cache-result.
(flyspell-word-search-backward, flyspell-word-search-forward): New functions.
(flyspell-word): Return t if nothing to check.
When parsing TeX code, check for after } or \.
Use flyspell-word-search-backward to find previous word.
Return nil if duplicated word.
For word already checked, return same value as last time.
Set flyspell-word-cache-result after checking.
Don't clobber the return value.
(flyspell-get-word): Major rewrite.
(flyspell-external-point-words): New locals pword, pcount.
Fix size used in progress message.
Find the proper corresponding word in flyspell-large-region-buffer.
(flyspell-region): Check for flyspell-large-region = nil.
(flyspell-highlight-incorrect-region): Clean up overlays in region.
(flyspell-auto-correct-word): Check that WORD is a cons.
(flyspell-correct-word): Likewise.
(flyspell-auto-correct-previous-word):
Narrow down to what's on the screen, and recenter overlays
at the end of the next word.
2005-05-29 14:29:34 +00:00
|
|
|
(overlay-start new-overlay)))))
|
|
|
|
|
|
|
|
(when flyspell-auto-correct-previous-pos
|
|
|
|
(save-excursion
|
|
|
|
(goto-char flyspell-auto-correct-previous-pos)
|
|
|
|
(let ((ispell-following-word t)) ;; point is at start
|
|
|
|
(if (numberp flyspell-auto-correct-previous-pos)
|
|
|
|
(goto-char flyspell-auto-correct-previous-pos))
|
|
|
|
(flyspell-auto-correct-word))
|
|
|
|
;; the point may have moved so reset this
|
|
|
|
(setq flyspell-auto-correct-previous-pos (point))))))))
|
2002-02-02 15:56:45 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-correct-word ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2006-11-06 16:06:11 +00:00
|
|
|
|
1998-06-26 01:24:05 +00:00
|
|
|
(defun flyspell-correct-word (event)
|
1998-07-29 03:21:32 +00:00
|
|
|
"Pop up a menu of possible corrections for a misspelled word.
|
|
|
|
The word checked is the word at the mouse position."
|
1998-06-26 01:24:05 +00:00
|
|
|
(interactive "e")
|
|
|
|
(let ((save (point)))
|
|
|
|
(mouse-set-point event)
|
2006-11-06 16:06:11 +00:00
|
|
|
(flyspell-correct-word-before-point event save)))
|
|
|
|
|
|
|
|
(defun flyspell-correct-word-before-point (&optional event opoint)
|
|
|
|
"Pop up a menu of possible corrections for misspelled word before point.
|
|
|
|
If EVENT is non-nil, it is the mouse event that invoked this operation;
|
|
|
|
that controls where to put the menu.
|
|
|
|
If OPOINT is non-nil, restore point there after adjusting it for replacement."
|
|
|
|
(interactive)
|
|
|
|
(unless (mouse-position)
|
|
|
|
(error "Pop-up menus do not work on this terminal"))
|
|
|
|
;; use the correct dictionary
|
|
|
|
(flyspell-accept-buffer-local-defs)
|
2007-05-24 22:12:25 +00:00
|
|
|
(or opoint (setq opoint (point-marker)))
|
2006-11-06 16:06:11 +00:00
|
|
|
(let ((cursor-location (point))
|
|
|
|
(word (flyspell-get-word nil)))
|
|
|
|
(if (consp word)
|
|
|
|
(let ((start (car (cdr word)))
|
|
|
|
(end (car (cdr (cdr word))))
|
|
|
|
(word (car word))
|
|
|
|
poss ispell-filter)
|
|
|
|
;; now check spelling of word.
|
|
|
|
(ispell-send-string "%\n") ;put in verbose mode
|
|
|
|
(ispell-send-string (concat "^" word "\n"))
|
|
|
|
;; wait until ispell has processed word
|
|
|
|
(while (progn
|
|
|
|
(accept-process-output ispell-process)
|
|
|
|
(not (string= "" (car ispell-filter)))))
|
|
|
|
;; Remove leading empty element
|
|
|
|
(setq ispell-filter (cdr ispell-filter))
|
|
|
|
;; ispell process should return something after word is sent.
|
|
|
|
;; Tag word as valid (i.e., skip) otherwise
|
|
|
|
(or ispell-filter
|
|
|
|
(setq ispell-filter '(*)))
|
|
|
|
(if (consp ispell-filter)
|
|
|
|
(setq poss (ispell-parse-output (car ispell-filter))))
|
|
|
|
(cond
|
|
|
|
((or (eq poss t) (stringp poss))
|
|
|
|
;; don't correct word
|
|
|
|
t)
|
|
|
|
((null poss)
|
|
|
|
;; ispell error
|
|
|
|
(error "Ispell: error in Ispell process"))
|
|
|
|
((featurep 'xemacs)
|
|
|
|
(flyspell-xemacs-popup
|
|
|
|
poss word cursor-location start end opoint))
|
|
|
|
(t
|
|
|
|
;; The word is incorrect, we have to propose a replacement.
|
|
|
|
(flyspell-do-correct (flyspell-emacs-popup event poss word)
|
|
|
|
poss word cursor-location start end opoint)))
|
|
|
|
(ispell-pdict-save t)))))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-do-correct ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2005-06-06 21:06:19 +00:00
|
|
|
(defun flyspell-do-correct (replace poss word cursor-location start end save)
|
|
|
|
"The popup menu callback."
|
|
|
|
;; Originally, the XEmacs code didn't do the (goto-char save) here and did
|
|
|
|
;; it instead right after calling the function.
|
1998-06-26 01:24:05 +00:00
|
|
|
(cond ((eq replace 'ignore)
|
2005-06-06 21:06:19 +00:00
|
|
|
(goto-char save)
|
1998-06-26 01:24:05 +00:00
|
|
|
nil)
|
|
|
|
((eq replace 'save)
|
2005-06-06 21:06:19 +00:00
|
|
|
(goto-char save)
|
|
|
|
(ispell-send-string (concat "*" word "\n"))
|
|
|
|
;; This was added only to the XEmacs side in revision 1.18 of
|
|
|
|
;; flyspell. I assume its absence on the Emacs side was an
|
|
|
|
;; oversight. --Stef
|
|
|
|
(ispell-send-string "#\n")
|
1998-06-26 01:24:05 +00:00
|
|
|
(flyspell-unhighlight-at cursor-location)
|
|
|
|
(setq ispell-pdict-modified-p '(t)))
|
|
|
|
((or (eq replace 'buffer) (eq replace 'session))
|
2005-06-06 21:06:19 +00:00
|
|
|
(ispell-send-string (concat "@" word "\n"))
|
1998-06-26 01:24:05 +00:00
|
|
|
(flyspell-unhighlight-at cursor-location)
|
|
|
|
(if (null ispell-pdict-modified-p)
|
|
|
|
(setq ispell-pdict-modified-p
|
|
|
|
(list ispell-pdict-modified-p)))
|
2005-06-06 21:06:19 +00:00
|
|
|
(goto-char save)
|
1998-06-26 01:24:05 +00:00
|
|
|
(if (eq replace 'buffer)
|
|
|
|
(ispell-add-per-file-word-list word)))
|
|
|
|
(replace
|
2005-06-06 21:06:19 +00:00
|
|
|
;; This was added only to the Emacs side. I assume its absence on
|
|
|
|
;; the XEmacs side was an oversight. --Stef
|
|
|
|
(flyspell-unhighlight-at cursor-location)
|
2000-07-24 18:36:17 +00:00
|
|
|
(let ((old-max (point-max))
|
|
|
|
(new-word (if (atom replace)
|
|
|
|
replace
|
|
|
|
(car replace)))
|
|
|
|
(cursor-location (+ (- (length word) (- end start))
|
|
|
|
cursor-location)))
|
2005-06-06 21:06:19 +00:00
|
|
|
(unless (equal new-word (car poss))
|
|
|
|
(delete-region start end)
|
|
|
|
(goto-char start)
|
|
|
|
(funcall flyspell-insert-function new-word)
|
|
|
|
(if flyspell-abbrev-p
|
|
|
|
(flyspell-define-abbrev word new-word)))
|
|
|
|
;; In the original Emacs code, this was only called in the body
|
|
|
|
;; of the if. I arbitrarily kept the XEmacs behavior instead.
|
|
|
|
(flyspell-ajust-cursor-point save cursor-location old-max)))
|
|
|
|
(t
|
|
|
|
(goto-char save)
|
|
|
|
nil)))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-ajust-cursor-point ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-ajust-cursor-point (save cursor-location old-max)
|
|
|
|
(if (>= save cursor-location)
|
|
|
|
(let ((new-pos (+ save (- (point-max) old-max))))
|
|
|
|
(goto-char (cond
|
|
|
|
((< new-pos (point-min))
|
|
|
|
(point-min))
|
|
|
|
((> new-pos (point-max))
|
|
|
|
(point-max))
|
|
|
|
(t new-pos))))
|
|
|
|
(goto-char save)))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-emacs-popup ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
1998-07-29 03:21:32 +00:00
|
|
|
(defun flyspell-emacs-popup (event poss word)
|
|
|
|
"The Emacs popup menu."
|
2007-05-24 22:12:25 +00:00
|
|
|
(unless window-system
|
|
|
|
(error "This command requires pop-up dialogs"))
|
1998-06-26 01:24:05 +00:00
|
|
|
(if (not event)
|
|
|
|
(let* ((mouse-pos (mouse-position))
|
|
|
|
(mouse-pos (if (nth 1 mouse-pos)
|
|
|
|
mouse-pos
|
|
|
|
(set-mouse-position (car mouse-pos)
|
2000-07-24 18:36:17 +00:00
|
|
|
(/ (frame-width) 2) 2)
|
1998-06-26 01:24:05 +00:00
|
|
|
(mouse-position))))
|
|
|
|
(setq event (list (list (car (cdr mouse-pos))
|
|
|
|
(1+ (cdr (cdr mouse-pos))))
|
|
|
|
(car mouse-pos)))))
|
|
|
|
(let* ((corrects (if flyspell-sort-corrections
|
|
|
|
(sort (car (cdr (cdr poss))) 'string<)
|
|
|
|
(car (cdr (cdr poss)))))
|
|
|
|
(cor-menu (if (consp corrects)
|
|
|
|
(mapcar (lambda (correct)
|
|
|
|
(list correct correct))
|
|
|
|
corrects)
|
|
|
|
'()))
|
|
|
|
(affix (car (cdr (cdr (cdr poss)))))
|
2006-01-21 13:11:21 +00:00
|
|
|
show-affix-info
|
|
|
|
(base-menu (let ((save (if (and (consp affix) show-affix-info)
|
1998-06-26 01:24:05 +00:00
|
|
|
(list
|
|
|
|
(list (concat "Save affix: " (car affix))
|
|
|
|
'save)
|
2002-02-02 15:56:45 +00:00
|
|
|
'("Accept (session)" session)
|
1998-06-26 01:24:05 +00:00
|
|
|
'("Accept (buffer)" buffer))
|
|
|
|
'(("Save word" save)
|
|
|
|
("Accept (session)" session)
|
|
|
|
("Accept (buffer)" buffer)))))
|
|
|
|
(if (consp cor-menu)
|
|
|
|
(append cor-menu (cons "" save))
|
|
|
|
save)))
|
|
|
|
(menu (cons "flyspell correction menu" base-menu)))
|
|
|
|
(car (x-popup-menu event
|
|
|
|
(list (format "%s [%s]" word (or ispell-local-dictionary
|
|
|
|
ispell-dictionary))
|
|
|
|
menu)))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-xemacs-popup ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
(defun flyspell-xemacs-popup (poss word cursor-location start end save)
|
2001-01-26 18:52:53 +00:00
|
|
|
"The XEmacs popup menu."
|
1998-06-26 01:24:05 +00:00
|
|
|
(let* ((corrects (if flyspell-sort-corrections
|
|
|
|
(sort (car (cdr (cdr poss))) 'string<)
|
|
|
|
(car (cdr (cdr poss)))))
|
|
|
|
(cor-menu (if (consp corrects)
|
|
|
|
(mapcar (lambda (correct)
|
|
|
|
(vector correct
|
2005-06-06 21:06:19 +00:00
|
|
|
(list 'flyspell-do-correct
|
1998-06-26 01:24:05 +00:00
|
|
|
correct
|
|
|
|
(list 'quote poss)
|
|
|
|
word
|
|
|
|
cursor-location
|
|
|
|
start
|
2000-07-24 18:36:17 +00:00
|
|
|
end
|
|
|
|
save)
|
1998-06-26 01:24:05 +00:00
|
|
|
t))
|
|
|
|
corrects)
|
|
|
|
'()))
|
|
|
|
(affix (car (cdr (cdr (cdr poss)))))
|
2006-01-21 13:11:21 +00:00
|
|
|
show-affix-info
|
|
|
|
(menu (let ((save (if (and (consp affix) show-affix-info)
|
1998-06-26 01:24:05 +00:00
|
|
|
(vector
|
|
|
|
(concat "Save affix: " (car affix))
|
2005-06-06 21:06:19 +00:00
|
|
|
(list 'flyspell-do-correct
|
1998-06-26 01:24:05 +00:00
|
|
|
''save
|
|
|
|
(list 'quote poss)
|
|
|
|
word
|
|
|
|
cursor-location
|
|
|
|
start
|
2000-07-24 18:36:17 +00:00
|
|
|
end
|
|
|
|
save)
|
1998-06-26 01:24:05 +00:00
|
|
|
t)
|
|
|
|
(vector
|
|
|
|
"Save word"
|
2005-06-06 21:06:19 +00:00
|
|
|
(list 'flyspell-do-correct
|
1998-06-26 01:24:05 +00:00
|
|
|
''save
|
|
|
|
(list 'quote poss)
|
|
|
|
word
|
|
|
|
cursor-location
|
|
|
|
start
|
2000-07-24 18:36:17 +00:00
|
|
|
end
|
|
|
|
save)
|
1998-06-26 01:24:05 +00:00
|
|
|
t)))
|
|
|
|
(session (vector "Accept (session)"
|
2005-06-06 21:06:19 +00:00
|
|
|
(list 'flyspell-do-correct
|
1998-06-26 01:24:05 +00:00
|
|
|
''session
|
|
|
|
(list 'quote poss)
|
|
|
|
word
|
|
|
|
cursor-location
|
|
|
|
start
|
2000-07-24 18:36:17 +00:00
|
|
|
end
|
|
|
|
save)
|
1998-06-26 01:24:05 +00:00
|
|
|
t))
|
|
|
|
(buffer (vector "Accept (buffer)"
|
2005-06-06 21:06:19 +00:00
|
|
|
(list 'flyspell-do-correct
|
1998-06-26 01:24:05 +00:00
|
|
|
''buffer
|
|
|
|
(list 'quote poss)
|
|
|
|
word
|
|
|
|
cursor-location
|
|
|
|
start
|
2000-07-24 18:36:17 +00:00
|
|
|
end
|
|
|
|
save)
|
1998-06-26 01:24:05 +00:00
|
|
|
t)))
|
|
|
|
(if (consp cor-menu)
|
|
|
|
(append cor-menu (list "-" save session buffer))
|
|
|
|
(list save session buffer)))))
|
|
|
|
(popup-menu (cons (format "%s [%s]" word (or ispell-local-dictionary
|
|
|
|
ispell-dictionary))
|
|
|
|
menu))))
|
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* Some example functions for real autocorrecting */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-maybe-correct-transposition (beg end poss)
|
2001-03-26 16:31:20 +00:00
|
|
|
"Check replacements for transposed characters.
|
|
|
|
|
|
|
|
If the text between BEG and END is equal to a correction suggested by
|
|
|
|
Ispell, after transposing two adjacent characters, correct the text,
|
|
|
|
and return t.
|
|
|
|
|
|
|
|
The third arg POSS is either the symbol 'doublon' or a list of
|
2005-06-14 11:36:04 +00:00
|
|
|
possible corrections as returned by `ispell-parse-output'.
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-06-14 11:36:04 +00:00
|
|
|
This function is meant to be added to `flyspell-incorrect-hook'."
|
2001-03-26 16:31:20 +00:00
|
|
|
(when (consp poss)
|
2004-05-08 12:48:49 +00:00
|
|
|
(catch 'done
|
|
|
|
(let ((str (buffer-substring beg end))
|
|
|
|
(i 0) (len (- end beg)) tmp)
|
|
|
|
(while (< (1+ i) len)
|
|
|
|
(setq tmp (aref str i))
|
|
|
|
(aset str i (aref str (1+ i)))
|
|
|
|
(aset str (1+ i) tmp)
|
|
|
|
(when (member str (nth 2 poss))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (+ beg i 1))
|
|
|
|
(transpose-chars 1))
|
|
|
|
(throw 'done t))
|
|
|
|
(setq tmp (aref str i))
|
|
|
|
(aset str i (aref str (1+ i)))
|
|
|
|
(aset str (1+ i) tmp)
|
|
|
|
(setq i (1+ i))))
|
|
|
|
nil)))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
|
|
|
(defun flyspell-maybe-correct-doubling (beg end poss)
|
2001-03-26 16:31:20 +00:00
|
|
|
"Check replacements for doubled characters.
|
|
|
|
|
|
|
|
If the text between BEG and END is equal to a correction suggested by
|
|
|
|
Ispell, after removing a pair of doubled characters, correct the text,
|
|
|
|
and return t.
|
|
|
|
|
|
|
|
The third arg POSS is either the symbol 'doublon' or a list of
|
2005-06-14 11:36:04 +00:00
|
|
|
possible corrections as returned by `ispell-parse-output'.
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-06-14 11:36:04 +00:00
|
|
|
This function is meant to be added to `flyspell-incorrect-hook'."
|
2001-01-26 18:52:53 +00:00
|
|
|
(when (consp poss)
|
2004-05-08 12:48:49 +00:00
|
|
|
(catch 'done
|
|
|
|
(let ((str (buffer-substring beg end))
|
|
|
|
(i 0) (len (- end beg)))
|
|
|
|
(while (< (1+ i) len)
|
|
|
|
(when (and (= (aref str i) (aref str (1+ i)))
|
|
|
|
(member (concat (substring str 0 (1+ i))
|
|
|
|
(substring str (+ i 2)))
|
|
|
|
(nth 2 poss)))
|
|
|
|
(goto-char (+ beg i))
|
|
|
|
(delete-char 1)
|
|
|
|
(throw 'done t))
|
|
|
|
(setq i (1+ i))))
|
|
|
|
nil)))
|
2000-07-24 18:36:17 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-already-abbrevp ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-already-abbrevp (table word)
|
|
|
|
(let ((sym (abbrev-symbol word table)))
|
|
|
|
(and sym (symbolp sym))))
|
1998-06-26 01:24:05 +00:00
|
|
|
|
2005-11-16 17:00:29 +00:00
|
|
|
;;*---------------------------------------------------------------------*/
|
|
|
|
;;* flyspell-change-abbrev ... */
|
|
|
|
;;*---------------------------------------------------------------------*/
|
2000-07-24 18:36:17 +00:00
|
|
|
(defun flyspell-change-abbrev (table old new)
|
|
|
|
(set (abbrev-symbol old table) new))
|
2002-01-29 13:42:12 +00:00
|
|
|
|
2000-07-24 18:36:17 +00:00
|
|
|
(provide 'flyspell)
|
2001-07-16 12:23:00 +00:00
|
|
|
|
2004-11-16 15:29:10 +00:00
|
|
|
;; arch-tag: 05d915b9-e9cf-44fb-9137-fc28f5eaab2a
|
1998-06-26 01:24:05 +00:00
|
|
|
;;; flyspell.el ends here
|