mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-03 08:30:09 +00:00
(ispell-internal-change-dictionary, ispell-change-dictionary):
Undo most of last change of 2006-01-13. (start, end): Move declaration outside of eval-when-compile.
This commit is contained in:
parent
949855fe64
commit
d83d8efe0b
@ -1,5 +1,9 @@
|
||||
2006-01-15 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* textmodes/ispell.el (ispell-internal-change-dictionary)
|
||||
(ispell-change-dictionary): Undo most of last change of 2006-01-13.
|
||||
(start, end): Move declaration outside of eval-when-compile.
|
||||
|
||||
* textmodes/flyspell.el (flyspell-kill-ispell-hook): New fun.
|
||||
(flyspell-mode-on): Use it.
|
||||
|
||||
|
@ -202,7 +202,6 @@
|
||||
;;; Code:
|
||||
|
||||
(defvar mail-yank-prefix)
|
||||
(eval-when-compile (defvar flyspell-word-cache-word))
|
||||
|
||||
;;; Custom.el macros require recompiling this when they are not present.
|
||||
;;; Add in backward compatible custom support.
|
||||
@ -2624,13 +2623,6 @@ By just answering RET you can find out what the current dictionary is."
|
||||
(setq ispell-local-dictionary dict)
|
||||
(setq ispell-local-dictionary-overridden t))
|
||||
(error "Undefined dictionary: %s" dict))
|
||||
;; For global setting clear out flyspell word cache when needed
|
||||
(when (and arg
|
||||
(featurep 'flyspell))
|
||||
(dolist (buf (buffer-list))
|
||||
(with-current-buffer buf
|
||||
(when flyspell-mode
|
||||
(setq flyspell-word-cache-word nil)))))
|
||||
(ispell-internal-change-dictionary)
|
||||
(message "%s Ispell dictionary set to %s"
|
||||
(if arg "Global" "Local")
|
||||
@ -2643,12 +2635,7 @@ a new one will be started when needed."
|
||||
(let ((dict (or ispell-local-dictionary ispell-dictionary)))
|
||||
(unless (equal ispell-current-dictionary dict)
|
||||
(ispell-kill-ispell t)
|
||||
(setq ispell-current-dictionary dict)
|
||||
;; If needed, start ispell process and clear out flyspell word cache
|
||||
(when (and (featurep 'flyspell)
|
||||
flyspell-mode)
|
||||
(ispell-init-process)
|
||||
(setq flyspell-word-cache-word nil)))))
|
||||
(setq ispell-current-dictionary dict))))
|
||||
|
||||
;;; Spelling of comments are checked when ispell-check-comments is non-nil.
|
||||
|
||||
@ -2981,9 +2968,8 @@ Point is placed at end of skipped region."
|
||||
coding)))))
|
||||
|
||||
;;; Avoid error messages when compiling for these dynamic variables.
|
||||
(eval-when-compile
|
||||
(defvar start)
|
||||
(defvar end))
|
||||
(defvar start)
|
||||
(defvar end)
|
||||
|
||||
(defun ispell-process-line (string shift)
|
||||
"Sends a LINE of text to ispell and processes the result.
|
||||
|
Loading…
Reference in New Issue
Block a user