mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

(flyspell-post-command-hook): Do nothing unless flyspell-mode is enabled.

Browse source 
(flyspell-pre-point): Make buffer-local.
This commit is contained in:
Agustín Martín 2009-01-16 15:20:49 +00:00
parent 57c48b9da0
commit ca0ebeccbb
2 changed files with 48 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2009-01-16 Agustín Martín <agustin.martin@hispalinux.es>
* textmodes/flyspell.el (flyspell-post-command-hook): Do nothing
unless flyspell-mode is enabled.
(flyspell-pre-point): Make buffer-local.
2009-01-16 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
* textmodes/bibtex.el (bibtex-format-entry): Fix previous change.
@ -9,7 +15,7 @@
constants.
(bibtex-mode): Doc fix.
2009-01-16 Agustín Martín <agustin.martin@hispalinux.es>
2009-01-16 Agustín Martín <agustin.martin@hispalinux.es>
* textmodes/ispell.el: Protect against declare-function undefined
in xemacs.

80
lisp/textmodes/flyspell.el
View file

@ -680,6 +680,7 @@ not the very same deplacement command."
(defvar flyspell-pre-column nil)
(defvar flyspell-pre-pre-buffer nil)
(defvar flyspell-pre-pre-point nil)
(make-variable-buffer-local 'flyspell-pre-point)
;;*---------------------------------------------------------------------*/
;;* flyspell-previous-command ... */
@ -929,46 +930,47 @@ Mostly we check word delimiters."
(defun flyspell-post-command-hook ()
"The `post-command-hook' used by flyspell to check a word in-the-fly."
(interactive)
(let ((command this-command)
;; Prevent anything we do from affecting the mark.
deactivate-mark)
(if (flyspell-check-pre-word-p)
(with-current-buffer flyspell-pre-buffer
'(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))
(progn
(setq flyspell-word-cache-end -1)
(setq flyspell-word-cache-result '_)))))
(while (and (not (input-pending-p)) (consp flyspell-changes))
(let ((start (car (car flyspell-changes)))
(stop (cdr (car flyspell-changes))))
(if (flyspell-check-changed-word-p start stop)
(when flyspell-mode
(let ((command this-command)
;; Prevent anything we do from affecting the mark.
deactivate-mark)
(if (flyspell-check-pre-word-p)
(with-current-buffer flyspell-pre-buffer
'(flyspell-debug-signal-pre-word-checked)
(save-excursion
'(flyspell-debug-signal-changed-checked)
(goto-char start)
(flyspell-word)))
(setq flyspell-changes (cdr flyspell-changes))))
(setq flyspell-previous-command command)))
(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))
(progn
(setq flyspell-word-cache-end -1)
(setq flyspell-word-cache-result '_)))))
(while (and (not (input-pending-p)) (consp flyspell-changes))
(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))))
;;*---------------------------------------------------------------------*/
;;* flyspell-notify-misspell ... */