[elpa] externals/assess 0a3e94477a 78/95: Support all of Emacs 24 series

[ELPA Syncer]

branch: externals/assess
commit 0a3e94477a08c3cda7c1dd4ea05ef87208901ac0
Author: Phillip Lord <phillip.lord@russet.org.uk>
Commit: Phillip Lord <phillip.lord@russet.org.uk>

    Support all of Emacs 24 series
    
    Make advice-add optional (introduced in Emacs 24.4).  Write define-error
    longhand (introduced in Emacs 24.3).  Add mass test target to Makefile.  Add
    more version to travis test.
---
 .travis.yml     |  9 ++++++---
 Makefile        |  9 +++++++++
 assess-robot.el |  1 -
 assess.el       | 17 ++++++++++++-----
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3fc09e0de2..c4dfc6c8c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,12 @@
 language: generic
 sudo: no
 env:
-  - EVM_EMACS=emacs-24.4-travis
-  - EVM_EMACS=emacs-24.5-travis
-  - EVM_EMACS=emacs-git-snapshot-travis
+ - EVM_EMACS=emacs-24.1-travis
+ - EVM_EMACS=emacs-24.2-travis
+ - EVM_EMACS=emacs-24.3-travis
+ - EVM_EMACS=emacs-24.4-travis
+ - EVM_EMACS=emacs-24.5-travis
+ - EVM_EMACS=emacs-25.1-travis
 install:
   - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > 
travis.sh && source ./travis.sh
   - evm install $EVM_EMACS --use --skip
diff --git a/Makefile b/Makefile
index d0b39818b1..727e5944f0 100644
--- a/Makefile
+++ b/Makefile
@@ -27,3 +27,12 @@ just-test:
 
 export:
        export
+
+multi-test:
+       make EMACS=$(EMACSES)/master/src/emacs test
+       make EMACS=$(EMACSES)/emacs-25/src/emacs test
+       make EMACS=$(EMACSES)/emacs-25.1/src/emacs test
+       make EMACS=$(EMACSES)/emacs-24.5/src/emacs test
+       make EMACS=$(EMACSES)/emacs-24.4/src/emacs test
+       make EMACS=$(EMACSES)/emacs-24.3/src/emacs test
+       make EMACS=$(EMACSES)/emacs-24.2/src/emacs test
diff --git a/assess-robot.el b/assess-robot.el
index ff9ea7148b..45ff0e2cba 100644
--- a/assess-robot.el
+++ b/assess-robot.el
@@ -109,4 +109,3 @@ In this case, MACRO is the \"long form\" accepted by
 
 (provide 'assess-robot)
 ;;; assess-robot.el ends here
-
diff --git a/assess.el b/assess.el
index 7cadab2c46..8485dcbf1c 100644
--- a/assess.el
+++ b/assess.el
@@ -7,7 +7,7 @@
 ;; Author: Phillip Lord <phillip.lord@russet.org.uk>
 ;; Maintainer: Phillip Lord <phillip.lord@russet.org.uk>
 ;; Version: 0.3.2
-;; Package-Requires: ((emacs "24.4")(m-buffer "0.14")(dash "2.12.0"))
+;; Package-Requires: ((emacs "24.1")(m-buffer "0.15"))
 
 ;; The contents of this file are subject to the GPL License, Version 3.0.
 
@@ -77,7 +77,7 @@
 ;; nadvice.el limits this package to Emacs 24.4. Emacs 25 has this fixed.
 
 ;; #+begin_src emacs-lisp
-(when (= emacs-major-version 24)
+(when (fboundp 'advice-add)
 
   (defun assess--ert-pp-with-indentation-and-newline (orig object)
     (let ((pp-escape-newlines nil))
@@ -97,9 +97,16 @@
 ;; get that for other reasons; so we create a new symbol here for general use.
 
 ;; #+begin_src emacs-lisp
-(define-error 'assess-deliberate-error
-  "An error deliberately caused during testing."
-  'error)
+(if (fboundp 'define-error)
+    (define-error 'assess-deliberate-error
+      "An error deliberately caused during testing."
+      'error)
+  (put 'assess-deliberate-error
+       'error-conditions
+       '(error))
+  (put 'assess-deliberate-error
+       'error-message
+       "A error deliberately caused during testing."))
 ;; #+end_src
 
 ;; ** Buffer creation