Package: emacs;
Reported by: Bastian Ballmann <bastian.ballmann <at> inf.ethz.ch>
Date: Tue, 9 Oct 2012 16:03:01 UTC
Severity: normal
Done: Noam Postavsky <npostavs <at> gmail.com>
Bug is archived. No further changes may be made.
Forwarded to forwarded 12611 https://sourceforge.net/p/hunspell/bugs/211/
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Bastian Ballmann <bastian.ballmann <at> inf.ethz.ch> To: <bug-gnu-emacs <at> gnu.org> Subject: Bugfix for broken hunspell choices Date: Tue, 9 Oct 2012 14:32:11 +0200
** Description
When using hunspell as spell checker and setting LANG=de_CH.utf-8 i
often get an empty choices buffer after running M-x ispell. The problem
is the use of the -a parameter. Hunspell only outputs half of the
corrections when using -a in contrast to a run without -a param.
Here's the configuration I tested with
(require 'ispell)
(setq ispell-dictionary-base-alist
'(
("de_DE"
"[a-zäöüßA-ZÄÖÜ]" "[^a-zäöüßA-ZÄÖÜ]" "[']" nil
("-d" "de_DE") nil utf-8)
("de_CH"
"[a-zäöüA-ZÄÖÜ]" "[^a-zäöüA-ZÄÖÜ]" "[']" nil
("-d" "de_CH") nil utf-8)
("en_US"
"[a-zA-Z]" "[^a-zA-Z]" "[']" nil
("-d" "en_US") nil utf-8)
("en_GB"
"[a-zA-Z]" "[^a-zA-Z]" "[']" nil
("-d" "en_GB") nil utf-8)
)
)
(eval-after-load "ispell"
(progn
(setq ispell-dictionary "de_CH")
(setq ispell-extra-args '("-t")) ; The input file is in TeX or
LaTeX format.
(setq ispell-silently-savep t) ; save personal dict without
confirmation
)
)
(setq-default ispell-program-name "hunspell")
(setq ispell-really-hunspell t)
(setq debug-on-error t)
The only way I was able to generate choices for all wrong written word
is by skiping the -a parameter.
** Patch
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 51a4800..2a73926 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1632,7 +1632,8 @@ This allows it to improve the suggestion list
based on actual misspellings."
(point-min) (point-max)
ispell-program-name nil
output-buf nil
- "-a"
+ ;; -a makes problems with choices when using
hunspell and utf-8
+ (if ispell-really-hunspell "" "-a")
;; hunspell -m option means something different
(if ispell-really-hunspell "" "-m")
ispell-args))
@@ -2577,8 +2578,12 @@ Optional third arg SHIFT is an offset to apply
based on previous corrections."
((eq (aref output 0) ?+) ; found because of root word
(substring output 2)) ; return root word
((equal 0 (string-match "[\ra-zA-Z]" output))
- (ding) ; error message from ispell!
- (message "Ispell error: %s" output)
+ (if (not (equal "hunspell" ispell-program-name))
+ (progn
+ (ding) ; error message from ispell!
+ (message "Ispell error: %s" output)
+ )
+ )
(sit-for 5)
nil)
(t ; need to process &, ?, and #'s
@@ -2664,7 +2669,8 @@ Keeps argument list for future Ispell invocations
for no async support."
(let ((process-connection-type ispell-use-ptys-p))
(apply 'start-process
"ispell" nil ispell-program-name
- "-a" ; Accept single input lines.
+ ;; -a makes problems with choices when using hunspell
and utf-8
+ (if ispell-really-hunspell "" "-a")
;; Make root/affix combos not in dict.
;; hunspell -m option means different.
(if ispell-really-hunspell "" "-m")
@@ -2752,30 +2758,34 @@ Keeps argument list for future Ispell
invocations for no async support."
(set-process-coding-system ispell-process
(ispell-get-coding-system)
(ispell-get-coding-system)))
;; Get version ID line
- (ispell-accept-output 3)
- ;; get more output if filter empty?
- (if (null ispell-filter) (ispell-accept-output 3))
- (cond ((null ispell-filter)
- (error "%s did not output version line" ispell-program-name))
- ((and
- (stringp (car ispell-filter))
- (if (string-match "warning: " (car ispell-filter))
- (progn
- (ispell-accept-output 3) ; was warn msg.
- (stringp (car ispell-filter)))
- (null (cdr ispell-filter)))
- (string-match "^@(#) " (car ispell-filter)))
- ;; got the version line as expected (we already know it's
the right
- ;; version, so don't bother checking again.)
- nil)
- (t
- ;; Otherwise, it must be an error message. Show the user.
- ;; But first wait to see if some more output is going to
arrive.
- ;; Otherwise we get cool errors like "Can't open ".
- (sleep-for 1)
- (ispell-accept-output 3)
- (error "%s" (mapconcat 'identity ispell-filter "\n"))))
- (setq ispell-filter nil) ; Discard version ID line
+ (if (not (eq ispell-program-name "hunspell"))
+ (progn
+ (ispell-accept-output 3)
+ ;; get more output if filter empty?
+ (if (null ispell-filter) (ispell-accept-output 3))
+ (cond ((null ispell-filter)
+ (error "%s did not output version line"
ispell-program-name))
+ ((and
+ (stringp (car ispell-filter))
+ (if (string-match "warning: " (car ispell-filter))
+ (progn
+ (ispell-accept-output 3) ; was warn msg.
+ (stringp (car ispell-filter)))
+ (null (cdr ispell-filter)))
+ (string-match "^@(#) " (car ispell-filter)))
+ ;; got the version line as expected (we already know
it's the right
+ ;; version, so don't bother checking again.)
+ nil)
+ (t
+ ;; Otherwise, it must be an error message. Show the
user.
+ ;; But first wait to see if some more output is
going to arrive.
+ ;; Otherwise we get cool errors like "Can't open ".
+ (sleep-for 1)
+ (ispell-accept-output 3)
+ (error "%s" (mapconcat 'identity ispell-filter "\n"))))
+ (setq ispell-filter nil) ; Discard version ID line
+ )
+ )
(let ((extended-char-mode (ispell-get-extended-character-mode)))
(if extended-char-mode ; ~ extended character mode
(ispell-send-string (concat extended-char-mode "\n"))))
Have a nice day!
Basti
--
ETH Zürich, Bastian Ballmann, IT Service Group
CAB E 44.1, Universitätsstrasse 6, CH-8092 Zürich
Tel +41 44 632 72 04
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.