aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReuben Thomas2016-12-13 00:43:21 +0000
committerReuben Thomas2016-12-13 19:43:49 +0000
commit9e6618becaa15b104f18d54371f35f065f430f81 (patch)
treed4bbd29906e57252e378e94ef87f71fa0d0cbc71
parent97f327d8de4d4f37b6cd90ab91f895a20a9de80c (diff)
downloademacs-9e6618becaa15b104f18d54371f35f065f430f81.tar.gz
emacs-9e6618becaa15b104f18d54371f35f065f430f81.zip
Remove support for aspell < 0.60 (from 2004)
lisp/textmodes/ispell.el (ispell-check-version): Require Aspell 0.60. (ispell-aspell-dictionary-alist): Remove check that we have Aspell 0.60.
-rw-r--r--lisp/textmodes/ispell.el35
1 files changed, 16 insertions, 19 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index c45b6203f0d..37a6ffc4ef9 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -727,8 +727,7 @@ Otherwise returns the library directory name, if that is defined."
727 727
728 ;; Make sure these variables are (re-)initialized to the default value 728 ;; Make sure these variables are (re-)initialized to the default value
729 (setq ispell-really-aspell nil 729 (setq ispell-really-aspell nil
730 ispell-aspell-supports-utf8 nil 730 ispell-really-hunspell nil
731 ispell-really-hunspell nil
732 ispell-encoding8-command nil) 731 ispell-encoding8-command nil)
733 732
734 (goto-char (point-min)) 733 (goto-char (point-min))
@@ -742,24 +741,24 @@ Otherwise returns the library directory name, if that is defined."
742 nil t) 741 nil t)
743 (match-string 1))))) 742 (match-string 1)))))
744 743
745 (let ((aspell-minver "0.50") 744 (let* ((aspell8-minver "0.60")
746 (aspell8-minver "0.60") 745 (ispell-minver "3.1.12")
747 (ispell-minver "3.1.12") 746 (hunspell8-minver "1.1.6")
748 (hunspell8-minver "1.1.6")) 747 (minver (cond
749 748 ((not (version<= ispell-minver ispell-program-version))
750 (unless (version<= ispell-minver ispell-program-version) 749 ispell-minver)
751 (error "%s release %s or greater is required" 750 ((and ispell-really-aspell
752 ispell-program-name 751 (not (version<= aspell8-minver ispell-really-aspell)))
753 ispell-minver)) 752 aspell8-minver))))
753
754 (if minver
755 (error "%s release %s or greater is required"
756 ispell-program-name
757 minver))
754 758
755 (cond 759 (cond
756 (ispell-really-aspell 760 (ispell-really-aspell
757 (if (version<= aspell-minver ispell-really-aspell) 761 (setq ispell-encoding8-command "--encoding="))
758 (if (version<= aspell8-minver ispell-really-aspell)
759 (progn
760 (setq ispell-aspell-supports-utf8 t)
761 (setq ispell-encoding8-command "--encoding=")))
762 (setq ispell-really-aspell nil)))
763 (ispell-really-hunspell 762 (ispell-really-hunspell
764 (if (version<= hunspell8-minver ispell-really-hunspell) 763 (if (version<= hunspell8-minver ispell-really-hunspell)
765 (setq ispell-encoding8-command "-i") 764 (setq ispell-encoding8-command "-i")
@@ -838,8 +837,6 @@ Internal use.")
838 837
839(defun ispell-find-aspell-dictionaries () 838(defun ispell-find-aspell-dictionaries ()
840 "Find Aspell's dictionaries, and record in `ispell-aspell-dictionary-alist'." 839 "Find Aspell's dictionaries, and record in `ispell-aspell-dictionary-alist'."
841 (unless (and ispell-really-aspell ispell-encoding8-command)
842 (error "This function only works with Aspell >= 0.60"))
843 (let* ((dictionaries 840 (let* ((dictionaries
844 (split-string 841 (split-string
845 (with-temp-buffer 842 (with-temp-buffer