[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 9e6618b 23/23: Remove support for aspell < 0.60 (fr
From: |
Reuben Thomas |
Subject: |
[Emacs-diffs] master 9e6618b 23/23: Remove support for aspell < 0.60 (from 2004) |
Date: |
Tue, 13 Dec 2016 19:44:37 +0000 (UTC) |
branch: master
commit 9e6618becaa15b104f18d54371f35f065f430f81
Author: Reuben Thomas <address@hidden>
Commit: Reuben Thomas <address@hidden>
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.
---
lisp/textmodes/ispell.el | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index c45b620..37a6ffc 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."
;; Make sure these variables are (re-)initialized to the default value
(setq ispell-really-aspell nil
- ispell-aspell-supports-utf8 nil
- ispell-really-hunspell nil
+ ispell-really-hunspell nil
ispell-encoding8-command nil)
(goto-char (point-min))
@@ -742,24 +741,24 @@ Otherwise returns the library directory name, if that is
defined."
nil t)
(match-string 1)))))
- (let ((aspell-minver "0.50")
- (aspell8-minver "0.60")
- (ispell-minver "3.1.12")
- (hunspell8-minver "1.1.6"))
-
- (unless (version<= ispell-minver ispell-program-version)
- (error "%s release %s or greater is required"
- ispell-program-name
- ispell-minver))
+ (let* ((aspell8-minver "0.60")
+ (ispell-minver "3.1.12")
+ (hunspell8-minver "1.1.6")
+ (minver (cond
+ ((not (version<= ispell-minver ispell-program-version))
+ ispell-minver)
+ ((and ispell-really-aspell
+ (not (version<= aspell8-minver
ispell-really-aspell)))
+ aspell8-minver))))
+
+ (if minver
+ (error "%s release %s or greater is required"
+ ispell-program-name
+ minver))
(cond
(ispell-really-aspell
- (if (version<= aspell-minver ispell-really-aspell)
- (if (version<= aspell8-minver ispell-really-aspell)
- (progn
- (setq ispell-aspell-supports-utf8 t)
- (setq ispell-encoding8-command "--encoding=")))
- (setq ispell-really-aspell nil)))
+ (setq ispell-encoding8-command "--encoding="))
(ispell-really-hunspell
(if (version<= hunspell8-minver ispell-really-hunspell)
(setq ispell-encoding8-command "-i")
@@ -838,8 +837,6 @@ Internal use.")
(defun ispell-find-aspell-dictionaries ()
"Find Aspell's dictionaries, and record in `ispell-aspell-dictionary-alist'."
- (unless (and ispell-really-aspell ispell-encoding8-command)
- (error "This function only works with Aspell >= 0.60"))
(let* ((dictionaries
(split-string
(with-temp-buffer
- [Emacs-diffs] master 97f327d 22/23: Minor docstring and comment fixes to ispell.el, (continued)
- [Emacs-diffs] master 97f327d 22/23: Minor docstring and comment fixes to ispell.el, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master f25c8b3 01/23: Remove ispell.el pre-GNU Emacs comments, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master c89dc9d 08/23: Remove XEmacs and old Emacs highlighting code, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 6b5ac58 20/23: Remove XEmacs-specific ispell-with-no-warnings, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master b989c41 14/23: Remove remaining mentions of XEmacs from ispell.el, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master db6e1f8 17/23: Remove support for ispell < 3.1.12, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 94834bd 21/23: Remove unused variable, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 028249e 05/23: Generalise over-specific documentation, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master ada717e 09/23: Remove some commented-out code, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 8886f15 13/23: Remove XEmacs-specific minibuffer handling code from ispell.el, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 9e6618b 23/23: Remove support for aspell < 0.60 (from 2004),
Reuben Thomas <=
- [Emacs-diffs] master a3ca97e 03/23: Remove unused ispell-looking-back, Reuben Thomas, 2016/12/13