branch: scratch/editorconfig-cc
commit 8688e1d3bf2648a3b16aee1f58082305beb23dee
Author: 10sr <8.slas...@gmail.com>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Revert "Add support for Emacs24.5"
This reverts commit 103081756d5d1de03dfa2d9d42b6e4a8581fca29.
---
.travis.yml | 1 -
editorconfig-core-handle.el | 2 --
editorconfig.el | 2 +-
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 9923bb4800..87aefe8e4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ 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 85ccf01c50..e36fb69683 100644
--- a/editorconfig-core-handle.el
+++ b/editorconfig-core-handle.el
@@ -32,8 +32,6 @@
;;; 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 2f928daeb4..cee7392b79 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") (cl-generic "0.3"))
+;; Package-Requires: ((cl-lib "0.5"))
;; See
;; http://github.com/editorconfig/editorconfig-emacs/graphs/contributors
