ispell.el (ispell-aspell-find-dictionary): Fix regexp for full xx_YY search.

This is needed for languages like Portuguese where there are aspell dicts
for pt_BR and pt_PT, not for plain pt. If we strip country part
`ispell-aspell-find-dictionary' does not find dicts for portuguese.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 374ee905f12578df300507d830047357e51b961b..0779035b47e71b339d4746dfddf1b6dc90cebaef 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-17  Agustín Martín  <agustin.martin@hispalinux.es>
+
+       * ispell.el (ispell-aspell-find-dictionary): Fix regexp for
+       languages like Portuguese with pt_{BR,PT} and no plain pt.
+
 2010-06-17  Juanma Barranquero  <lekktu@gmail.com>
 
        * emacs-lisp/package.el (package-menu-mode-map):

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 1a657b0fdf9269e7a23edcff092e2cbc1b44c37b..4d0cc84235112c343faf2f88c0cf04b00f979dc3 100644 (file)
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -982,8 +982,8 @@ Assumes that value contains no whitespace."
   ;; This returns nil if the data file does not exist.
   ;; Can someone please explain the return value format when the
   ;; file does exist -- rms?
-  (let* ((lang ;; Strip out region, variant, etc.
-         (and (string-match "^[[:alpha:]]+" dict-name)
+  (let* ((lang ;; Strip out variant, etc.
+         (and (string-match "^[[:alpha:]_]+" dict-name)
               (match-string 0 dict-name)))
         (data-file
          (concat (or ispell-aspell-data-dir