From 155e9e2bbf9b82ad597e31729922966bbddffed5 Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Sun, 4 Dec 2016 21:50:18 +0000 Subject: [PATCH 18/21] Remove support for ispell < 3.1.12 * lisp/textmodes/ispell.el (ispell-offset): Remove. (ispell-check-version): Require ispell >= 3.1.12, released in 1994. (ispell-process-line): No longer use ispell-offset. --- lisp/textmodes/ispell.el | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index d1001cd..724ce3d 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -673,9 +673,6 @@ ispell-dicts-name2locale-equivs-alist -(defvar ispell-offset -1 - "Offset that maps protocol differences between ispell 3.1 versions.") - (defconst ispell-version "ispell.el 3.6 - 7-Jan-2003") @@ -758,13 +755,10 @@ ispell-check-version (let ((aspell-minver "0.50") (aspell8-minver "0.60") - (ispell0-minver "3.1.0") (ispell-minver "3.1.12") (hunspell8-minver "1.1.6")) - (if (version<= ispell0-minver ispell-program-version) - (or (version<= ispell-minver ispell-program-version) - (setq ispell-offset 0)) + (unless (version<= ispell-minver ispell-program-version) (error "%s release %s or greater is required" ispell-program-name ispell-minver)) @@ -3358,7 +3352,7 @@ ispell-process-line ;; Markers can move with highlighting! This destroys ;; end of region markers line-end and ispell-region-end (let ((word-start - (copy-marker (+ ispell-start ispell-offset (car (cdr poss))))) + (copy-marker (+ ispell-start (car (cdr poss))))) (word-len (length (car poss))) (line-end (copy-marker ispell-end)) (line-start (copy-marker ispell-start)) -- 2.7.4