diff options
| author | Reuben Thomas | 2016-12-04 21:50:18 +0000 |
|---|---|---|
| committer | Reuben Thomas | 2016-12-13 19:43:49 +0000 |
| commit | db6e1f82976a7f232a4a206a3c850ed34cfbfdd3 (patch) | |
| tree | ab0b1224dc6716bcb12c755bafa98e151d009ff6 | |
| parent | 3affed01e15e54ca240aecea32d4fc1e329b21ea (diff) | |
| download | emacs-db6e1f82976a7f232a4a206a3c850ed34cfbfdd3.tar.gz emacs-db6e1f82976a7f232a4a206a3c850ed34cfbfdd3.zip | |
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.
| -rw-r--r-- | lisp/textmodes/ispell.el | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index b3fee99b361..412e838e11b 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el | |||
| @@ -673,9 +673,6 @@ here just for backwards compatibility.") | |||
| 673 | 673 | ||
| 674 | 674 | ||
| 675 | 675 | ||
| 676 | (defvar ispell-offset -1 | ||
| 677 | "Offset that maps protocol differences between ispell 3.1 versions.") | ||
| 678 | |||
| 679 | (defconst ispell-version "ispell.el 3.6 - 7-Jan-2003") | 676 | (defconst ispell-version "ispell.el 3.6 - 7-Jan-2003") |
| 680 | 677 | ||
| 681 | 678 | ||
| @@ -758,13 +755,10 @@ Otherwise returns the library directory name, if that is defined." | |||
| 758 | 755 | ||
| 759 | (let ((aspell-minver "0.50") | 756 | (let ((aspell-minver "0.50") |
| 760 | (aspell8-minver "0.60") | 757 | (aspell8-minver "0.60") |
| 761 | (ispell0-minver "3.1.0") | ||
| 762 | (ispell-minver "3.1.12") | 758 | (ispell-minver "3.1.12") |
| 763 | (hunspell8-minver "1.1.6")) | 759 | (hunspell8-minver "1.1.6")) |
| 764 | 760 | ||
| 765 | (if (version<= ispell0-minver ispell-program-version) | 761 | (unless (version<= ispell-minver ispell-program-version) |
| 766 | (or (version<= ispell-minver ispell-program-version) | ||
| 767 | (setq ispell-offset 0)) | ||
| 768 | (error "%s release %s or greater is required" | 762 | (error "%s release %s or greater is required" |
| 769 | ispell-program-name | 763 | ispell-program-name |
| 770 | ispell-minver)) | 764 | ispell-minver)) |
| @@ -3360,7 +3354,7 @@ Returns the sum SHIFT due to changes in word replacements." | |||
| 3360 | ;; Markers can move with highlighting! This destroys | 3354 | ;; Markers can move with highlighting! This destroys |
| 3361 | ;; end of region markers line-end and ispell-region-end | 3355 | ;; end of region markers line-end and ispell-region-end |
| 3362 | (let ((word-start | 3356 | (let ((word-start |
| 3363 | (copy-marker (+ ispell-start ispell-offset (car (cdr poss))))) | 3357 | (copy-marker (+ ispell-start (car (cdr poss))))) |
| 3364 | (word-len (length (car poss))) | 3358 | (word-len (length (car poss))) |
| 3365 | (line-end (copy-marker ispell-end)) | 3359 | (line-end (copy-marker ispell-end)) |
| 3366 | (line-start (copy-marker ispell-start)) | 3360 | (line-start (copy-marker ispell-start)) |