[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.174 
emacs/lisp/textmodes/ispell.el:1.175
*** emacs/lisp/textmodes/ispell.el:1.174        Sat Sep 10 15:08:03 2005
--- emacs/lisp/textmodes/ispell.el      Sat Sep 17 11:35:13 2005
***************
*** 719,724 ****
--- 719,730 ----
  
  (defvar ispell-really-aspell nil) ; Non-nil if aspell extensions should be 
used
  
+ (defvar ispell-aspell-supports-utf8 nil
+   "Non-nil means to try to automatically find aspell dictionaries.
+ This is set to t in ispell-check-version for aspell >= 0.60.
+ 
+ Earlier aspell versions do not consistently support UTF-8.  Handling
+ this would require some extra guessing in `ispell-aspell-find-dictionary'.")
  
  
  
***************
*** 814,822 ****
          (goto-char (point-min))
          (let (case-fold-search)
            (setq ispell-really-aspell
!               (and (search-forward-regexp "(but really Aspell \\(.*\\))" nil 
t)
!                    (if (version< (match-string 1) "0.60")
!                        (error "aspell version 0.60 or greater is required")
                       t)))))
        (kill-buffer (current-buffer)))
      result))
--- 820,830 ----
          (goto-char (point-min))
          (let (case-fold-search)
            (setq ispell-really-aspell
!               (and (search-forward-regexp
!                     "(but really Aspell \\(.*\\))" nil t)
!                    (progn
!                      (setq ispell-aspell-supports-utf8
!                            (not (version< (match-string 1) "0.60")))
                       t)))))
        (kill-buffer (current-buffer)))
      result))
***************
*** 972,978 ****
             (condition-case ()
                 (progn (ispell-check-version) t)
               (error nil))
!            ispell-really-aspell)
      (ispell-find-aspell-dictionaries))
    (let ((dicts (append ispell-local-dictionary-alist ispell-dictionary-alist))
        (dict-list (cons "default" nil))
--- 980,987 ----
             (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))