Merge from origin/emacs-25

[gnu-emacs] / lisp / cedet / inversion.el

diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index 6a13a12e8e11d2603c573601670b0dfeb97d1c44..26f526872e962c1a1d2c4b7bdbe1abda85dfe2b8 100644 (file)
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -1,9 +1,9 @@
 ;;; inversion.el --- When you need something in version XX.XX
 
-;;; Copyright (C) 2002-2003, 2005-2012  Free Software Foundation, Inc.
+;;; Copyright (C) 2002-2003, 2005-2016 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Version: 0.2
+;; Version: 1.3
 ;; Keywords: OO, lisp
 
 ;; This file is part of GNU Emacs.
@@ -230,8 +230,8 @@ string.      INCOMPATIBLE-VERSION can be nil.
 RESERVED arguments are kept for a later use.
 Return:
 - nil if everything is ok.
-- 'outdated if VERSION is less than MINIMUM.
-- 'incompatible if VERSION is not backward compatible with MINIMUM.
+- `outdated' if VERSION is less than MINIMUM.
+- `incompatible' if VERSION is not backward compatible with MINIMUM.
 - t if the check failed."
   (let ((code (if (stringp version)
                  (inversion-decode-version version)
@@ -348,7 +348,7 @@ Optional argument RESERVED is saved for later use."
 
 ;;;###autoload
 (defun inversion-require-emacs (emacs-ver xemacs-ver sxemacs-ver)
-  "Declare that you need either EMACS-VER, XEMACS-VER or SXEMACE-ver.
+  "Declare that you need either EMACS-VER, XEMACS-VER or SXEMACS-ver.
 Only checks one based on which kind of Emacs is being run."
   (let ((err (inversion-test 'emacs
                             (cond ((featurep 'sxemacs)