[Emacs-diffs] /srv/bzr/emacs/trunk r101382: textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.

[Agustin martin]

------------------------------------------------------------
revno: 101382
committer: Agustin martin <address@hidden>
branch nick: trunk
timestamp: Wed 2010-09-08 16:54:00 +0200
message:
  textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
modified:
  lisp/ChangeLog
  lisp/textmodes/ispell.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-08 14:42:54 +0000
+++ b/lisp/ChangeLog    2010-09-08 14:54:00 +0000
@@ -1,3 +1,8 @@
+2010-09-08  Agustín Martín  <address@hidden>
+
+       * textmodes/ispell.el (ispell-valid-dictionary-list):
+       Simplify logic.
+
 2010-09-08  Michael Albinus  <address@hidden>
 
        Migrate to Tramp 2.2.  Rearrange load dependencies.

=== modified file 'lisp/textmodes/ispell.el'
--- a/lisp/textmodes/ispell.el  2010-09-07 18:01:23 +0000
+++ b/lisp/textmodes/ispell.el  2010-09-08 14:54:00 +0000
@@ -1116,26 +1116,24 @@
 
   (let ((dicts (append ispell-local-dictionary-alist ispell-dictionary-alist))
        (dict-list (cons "default" nil))
-       name load-dict)
+       name dict-bname)
     (dolist (dict dicts)
       (setq name (car dict)
-           load-dict (car (cdr (member "-d" (nth 5 dict)))))
+           dict-bname (or (car (cdr (member "-d" (nth 5 dict))))
+                          name))
       ;; Include if the dictionary is in the library, or dir not defined.
       (if (and
           name
-          ;; include all dictionaries if lib directory not known.
           ;; For Aspell, we already know which dictionaries exist.
           (or ispell-really-aspell
+              ;; Include all dictionaries if lib directory not known.
+              ;; Same for Hunspell, where ispell-library-directory is nil.
               (not ispell-library-directory)
               (file-exists-p (concat ispell-library-directory
-                                     "/" name ".hash"))
-              (file-exists-p (concat ispell-library-directory "/" name ".has"))
-              (and load-dict
-                   (or (file-exists-p (concat ispell-library-directory
-                                              "/" load-dict ".hash"))
-                       (file-exists-p (concat ispell-library-directory
-                                              "/" load-dict ".has"))))))
-         (setq dict-list (cons name dict-list))))
+                                     "/" dict-bname ".hash"))
+              (file-exists-p (concat ispell-library-directory
+                                     "/" dict-bname ".has"))))
+         (push name dict-list)))
     dict-list))
 
 ;;; define commands in menu in opposite order you want them to appear.