mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 6b380eb8e24397ea151bad7f2f9916d04c39e3be Author: Matthew L. Fidler <[email protected]> Date: Mon Jun 16 10:36:11 2014 -0500 Modified ergoemacs-init not to depend on anything... --- Cask | 1 + test/ergoemacs-init.el | 22 ++++++---------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Cask b/Cask index 16fc7dd..14d186c 100644 --- a/Cask +++ b/Cask @@ -6,6 +6,7 @@ "bash-us.txt" "os_x_qwerty.dict.txt") (development + (depends-on "keyfreq") (depends-on "f") (depends-on "ecukes") (depends-on "ert-runner") diff --git a/test/ergoemacs-init.el b/test/ergoemacs-init.el index 9a4cff9..97b6d94 100644 --- a/test/ergoemacs-init.el +++ b/test/ergoemacs-init.el @@ -29,30 +29,20 @@ ;;; Code: ;; Init file for test suite. -(require 'ergoemacs-mode) -(require 'keyfreq-mode) -(require 'f) -(require 's) -(require 'dash) -(require 'el-mock) -(require 'cask) - (defvar ergoemacs-test--test-path - (f-dirname (f-this-file))) + (file-name-directory (or load-file-name (buffer-file-name)))) (defvar ergoemacs-test--root-path - (f-parent ergoemacs-test--test-path)) + (file-name-directory (substring ergoemacs-test--test-path 0 -1))) (defvar ergoemacs-test--vendor-path - (f-expand "vendor" ergoemacs-test--root-path)) - - -(load (f-expand "ergoemacs-mode" ergoemacs-test--root-path)) + (expand-file-name "vendor" ergoemacs-test--root-path)) (unless (require 'ert nil 'noerror) - (require 'ert (f-expand "ert" ergoemacs-test--vendor-path))) + (add-to-list 'load-path ergoemacs-test--vendor-path) + (require 'ert (expand-file-name "ert" ergoemacs-test--vendor-path))) -(add-to-list 'load-path ergoemacs-test--root-path) +(require 'ergoemacs-mode) (defvar ergoemacs-test-lorem-ipsum "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed
