(ispell-check-version):

Ignore hyphen, and all that follows, in aspell's version text.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19b509ca29255814701d46eb01b542e439705c76..145c4288b3163ff22ed67158c08b841643364935 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
-2005-10-07  Jay Belanger  <belanger@truman.edu>
+2005-10-08  Eric Hanchrow <offby1@blarg.net>
+
+       * textmodes/ispell.el (ispell-check-version):
+       Ignore hyphen, and all that follows, in aspell's version text.
+
+2005-10-08  Jay Belanger  <belanger@truman.edu>
 
        * calc/calc-arith.el (math-known-square-matrixp): New function.
        (math-pow-fancy): Check for matrices before distributing exponent
@@ -97,10 +102,9 @@
        * progmodes/gdb-ui.el (gdb-fringe-width -> gdb-buffer-fringe-width):
        Typo.
 
-2005-10-06  Thien-Thi Nguyen  <ttn@gnu.org>
+2005-10-06  Michael Cadilhac  <michael.cadilhac-@t-lrde.epita.fr> (tiny change)
 
        * play/zone.el (zone): Wrap body with save-window-excursion.
-       Suggested by Michael Cadilhac.
 
 2005-10-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 235df7140151497b4a17e6d4f4fe6fe8ca9e384b..d4764f0b7bd7cd29ea6cc8368985bdc073d6c7f3 100644 (file)
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -821,6 +821,7 @@ Otherwise returns the library directory name, if that is defined."
         (let (case-fold-search)
           (setq ispell-really-aspell
                (and (search-forward-regexp
+                     "(but really Aspell \\(.*?\\)\\(-[0-9]+\\)?)" nil t)
                      "(but really Aspell \\(.*\\))" nil t)
                     (progn
                       (setq ispell-aspell-supports-utf8