procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Agustín Martín <agustin.martin at hispalinux.es>

Browse source 
(flyspell-large-region): Explicitly set encoding for aspell process
and for communication with it.  Only add "-d" option if not already
present.  Use ispell-current-dictionary and
ispell-current-personal-dictionary.  General reorganization.
This commit is contained in:
Glenn Morris 2007-12-02 18:18:19 +00:00
parent acf7984c5b
commit a3614e04ba
2 changed files with 48 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

59
lisp/textmodes/flyspell.el
View file

@ -1531,29 +1531,42 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
(if flyspell-issue-message-flag (message "Checking region..."))
(set-buffer curbuf)
(ispell-check-version)
(let ((c (apply 'ispell-call-process-region beg
end
ispell-program-name
nil
buffer
nil
(if ispell-really-aspell "list" "-l")
(let (args)
;; Local dictionary becomes the global dictionary in use.
(if ispell-local-dictionary
(setq ispell-dictionary ispell-local-dictionary))
(setq args (ispell-get-ispell-args))
(if ispell-dictionary ; use specified dictionary
(setq args
(append (list "-d" ispell-dictionary) args)))
(if ispell-personal-dictionary ; use specified pers dict
(setq args
(append args
(list "-p"
(expand-file-name
ispell-personal-dictionary)))))
(setq args (append args ispell-extra-args))
args))))
;; 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))
(if (and ispell-really-aspell
ispell-aspell-supports-utf8)
(setq args
(append args
(list
(concat "--encoding="
(symbol-name
encoding))))))
(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)))
(if (eq c 0)
(progn
(flyspell-process-localwords buffer)