From 8cf4109cf660239326e18566ab67a2c5d1d19829 Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Sun, 4 Dec 2016 00:54:04 +0000 Subject: [PATCH 03/21] Assume we have version<= for checking ispell version * lisp/textmodes/ispell.el (ispell-check-minver): Remove. (ispell-check-version): Use version<= directly. --- lisp/textmodes/ispell.el | 46 +++++----------------------------------------- 1 file changed, 5 insertions(+), 41 deletions(-) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 25099e3..14a782d 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -118,42 +118,6 @@ ;; Recursive edits (?C-r or ?R) inside a keyboard text replacement check (?r) ;; can cause misalignment errors. -;;; Compatibility code for XEmacs and (not too) older emacsen: -(defalias 'ispell-check-minver - (if (fboundp 'version<=) 'version<= - (lambda (minver version) - "Check if string VERSION is at least string MINVER. -Both must be in [0-9]+.[0-9]+... format. This is a fallback -compatibility function in case `version<=' is not available." - (let ((pending t) - (return t) - start-ver start-mver) - ;; Loop until an absolute greater or smaller condition is reached - ;; or until no elements are left in any of version and minver. In - ;; this case version is exactly the minimal, so return OK. - (while pending - (let (ver mver) - (if (string-match "[0-9]+" version start-ver) - (setq start-ver (match-end 0) - ver (string-to-number (match-string 0 version)))) - (if (string-match "[0-9]+" minver start-mver) - (setq start-mver (match-end 0) - mver (string-to-number (match-string 0 minver)))) - - (if (or ver mver) - (progn - (or ver (setq ver 0)) - (or mver (setq mver 0)) - ;; If none of below conditions match, this element is the - ;; same. Go checking next element. - (if (> ver mver) - (setq pending nil) - (if (< ver mver) - (setq pending nil - return nil)))) - (setq pending nil)))) - return)))) - ;; XEmacs does not have looking-back (defalias 'ispell-looking-back (if (fboundp 'looking-back) 'looking-back @@ -829,8 +793,8 @@ ispell-check-version (ispell-minver "3.1.12") (hunspell8-minver "1.1.6")) - (if (ispell-check-minver ispell0-minver ispell-program-version) - (or (ispell-check-minver ispell-minver ispell-program-version) + (if (version<= ispell0-minver ispell-program-version) + (or (version<= ispell-minver ispell-program-version) (setq ispell-offset 0)) (error "%s release %s or greater is required" ispell-program-name @@ -838,14 +802,14 @@ ispell-check-version (cond (ispell-really-aspell - (if (ispell-check-minver aspell-minver ispell-really-aspell) - (if (ispell-check-minver aspell8-minver 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))) (ispell-really-hunspell - (if (ispell-check-minver hunspell8-minver ispell-really-hunspell) + (if (version<= hunspell8-minver ispell-really-hunspell) (setq ispell-encoding8-command "-i") (setq ispell-really-hunspell nil)))))) result)) -- 2.7.4