From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 28 Oct 2001 14:20:39 +0000 (+0000)
Subject: (sc-emacs-features): Test for "Emacs 19"
X-Git-Tag: ttn-vms-21-2-B4~19078
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=36656ee3bcb7c8bae14b5b4e7eb3c443bd240062;p=emacs.git

(sc-emacs-features): Test for "Emacs 19"
by really checking that it is not version 18.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10451ae119c..4c5ad596eff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2001-10-28  Richard M. Stallman  <rms@gnu.org>
 
+	* textmodes/ispell.el (version18p, version20p): Vars deleted.
+	All uses removed--assume Emacs version is >= 20.
+
+	* mail/supercite.el (sc-emacs-features): Test for "Emacs 19"
+	by really checking that it is not version 18.
+
 	* emacs-lisp/lisp-mode.el (eval-defun): Doc fix.
 
 2001-10-28  Miles Bader  <miles@gnu.org>
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index dd5ce02946f..db4a492de1d 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -513,9 +513,8 @@ string."
 (defconst sc-emacs-features
   (let ((version 'v18)
 	(flavor  'GNU))
-    (if (or
-	 (string= (substring emacs-version 0 2) "19")
-	 (string= (substring emacs-version 0 2) "20"))
+    (if (not
+	 (string= (substring emacs-version 0 2) "18"))
 	(setq version 'v19))
     (if (string-match "Lucid" emacs-version)
 	(setq flavor 'Lucid))
@@ -524,9 +523,9 @@ string."
   "A list describing what version of Emacs we're running on.
 Known flavors are:
 
-Emacs 18        : (v18 GNU)
-Emacs 19 or 20  : (v19 GNU)
-Lucid 19 or 20  : (v19 Lucid)")
+Emacs 18           : (v18 GNU)
+Emacs 19 or later  : (v19 GNU)
+Lucid 19 or later  : (v19 Lucid)")
 
 
 (defvar sc-tmp-nested-regexp nil