branch: scratch/editorconfig-cc
commit 96123213ed4ff3d5e39242a54f854cb93cc84f34
Author: 10sr <8.slas...@gmail.com>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Add support for Emacs24.5
---
.travis.yml | 1 +
editorconfig-core-handle.el | 2 ++
editorconfig.el | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 87aefe8e4b..9923bb4800 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ before_install:
- ./.evm/bin/evm config path /tmp
- ./.evm/bin/evm install emacs-$EMACS_VERSION-travis --use
- ./.evm/bin/emacs --version
+ - if [[ "$EMACS_VERSION" == 24.5 ]]; then curl
"http://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/packages/cl-generic/cl-generic.el?id=a1cdea05e8cbfe15ba075c64417db20b814e48e8";
>cl-generic.el; fi
script:
make test EMACS=$PWD/.evm/bin/emacs
diff --git a/editorconfig-core-handle.el b/editorconfig-core-handle.el
index e36fb69683..85ccf01c50 100644
--- a/editorconfig-core-handle.el
+++ b/editorconfig-core-handle.el
@@ -32,6 +32,8 @@
;;; Code:
(require 'cl-lib)
+;; Require explicit load for Emacs<25
+(require 'cl-generic)
(require 'editorconfig-fnmatch)
diff --git a/editorconfig.el b/editorconfig.el
index cee7392b79..2f928daeb4 100644
--- a/editorconfig.el
+++ b/editorconfig.el
@@ -5,7 +5,7 @@
;; Author: EditorConfig Team <editorcon...@googlegroups.com>
;; Version: 0.7.14
;; URL: https://github.com/editorconfig/editorconfig-emacs#readme
-;; Package-Requires: ((cl-lib "0.5"))
+;; Package-Requires: ((cl-lib "0.5") (cl-generic "0.3"))
;; See
;; http://github.com/editorconfig/editorconfig-emacs/graphs/contributors
