[Emacs-diffs] Changes to emacs/lisp/textmodes/ispell.el

[Eli Zaretskii]

Index: emacs/lisp/textmodes/ispell.el
diff -c emacs/lisp/textmodes/ispell.el:1.176 
emacs/lisp/textmodes/ispell.el:1.177
*** emacs/lisp/textmodes/ispell.el:1.176        Sun Sep 18 12:28:29 2005
--- emacs/lisp/textmodes/ispell.el      Sat Sep 24 10:45:11 2005
***************
*** 880,885 ****
--- 880,895 ----
  (defvar ispell-have-aspell-dictionaries nil
    "Non-nil if we have queried Aspell for dictionaries at least once.")
  
+ (defun ispell-maybe-find-aspell-dictionaries ()
+   "Find Aspell's dictionaries, unless already done."
+   (when (and (not ispell-have-aspell-dictionaries)
+            (condition-case ()
+                (progn (ispell-check-version) t)
+              (error nil))
+            ispell-really-aspell
+            ispell-aspell-supports-utf8)
+     (ispell-find-aspell-dictionaries)))
+ 
  (defun ispell-find-aspell-dictionaries ()
    "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'."
    (interactive)
***************
*** 976,988 ****
    "Returns a list of valid dictionaries.
  The variable `ispell-library-directory' defines the library location."
    ;; If Ispell is really Aspell, query it for the dictionary list.
!   (when (and (not ispell-have-aspell-dictionaries)
!            (condition-case ()
!                (progn (ispell-check-version) t)
!              (error nil))
!            ispell-really-aspell
!            ispell-aspell-supports-utf8)
!     (ispell-find-aspell-dictionaries))
    (let ((dicts (append ispell-local-dictionary-alist ispell-dictionary-alist))
        (dict-list (cons "default" nil))
        name load-dict)
--- 986,992 ----
    "Returns a list of valid dictionaries.
  The variable `ispell-library-directory' defines the library location."
    ;; If Ispell is really Aspell, query it for the dictionary list.
!   (ispell-maybe-find-aspell-dictionaries)
    (let ((dicts (append ispell-local-dictionary-alist ispell-dictionary-alist))
        (dict-list (cons "default" nil))
        name load-dict)
***************
*** 3573,3578 ****
--- 3577,3583 ----
  
  (defun ispell-accept-buffer-local-defs ()
    "Load all buffer-local information, restarting Ispell when necessary."
+   (ispell-maybe-find-aspell-dictionaries)
    (ispell-buffer-local-dict)          ; May kill ispell-process.
    (ispell-buffer-local-words)         ; Will initialize ispell-process.
    (ispell-buffer-local-parsing))