Do not load "goto-chg.el" from "evil-integration.el"

If the goto-chg.el package is available and installed properly it is
autoloaded (or should be loaded manually). The corresponding motions
g; and g, are now *always* bound to `goto-last-change' and
`goto-last-change-reverse', resp., and work if goto-chg.el is
available, otherwise an error is raised. The old implementation loaded
"goto-chg.el" automatically from "evil-integration.el". But even if
this succeeded the corresponding bindings for g; and g, would not have
been installed (unless "goto-chg.el" had been loaded manually before
evil), because "evil-maps.el" is loaded *before*
"evil-integration.el", thus the loading of "goto-chg.el" in the latter
file is useless.

The package "lib/goto-chg.el" coming with evil is loaded automatically
for "make emacs" and "make terminal".

1 files changed, 5 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 9d40253..7bbe77a 100644
--- a/Makefile
+++ b/Makefile
@@ -64,18 +64,20 @@ tests: compile
 
 # Load Evil in a fresh instance of Emacs and run all tests.
 emacs:
-	$(EMACS) -Q -L . $(LIBS) -l evil-tests.el --eval "(evil-mode 1)" \
+	$(EMACS) -Q -L . $(LIBS) -l goto-chg.el -l evil-tests.el \
+--eval "(evil-mode 1)" \
 --eval "(evil-tests-initialize '(${TAG}) '(${PROFILER}) t)" &
 
 # Load Evil in a terminal Emacs and run all tests.
 term: terminal
 terminal:
-	$(EMACS) -nw -Q -L . $(LIBS) -l evil-tests.el --eval "(evil-mode 1)" \
+	$(EMACS) -nw -Q -L . $(LIBS) -l goto-chg.el -l evil-tests.el \
+--eval "(evil-mode 1)" \
 --eval "(evil-tests-initialize '(${TAG}) '(${PROFILER}) t)"
 
 # Run all tests with profiler.
 profiler:
-	$(EMACS) --batch -Q -L . $(LIBS) -l evil-tests.el \
+	$(EMACS) --batch -Q -L . $(LIBS) -l goto-chg.el -l evil-tests.el \
 --eval "(evil-tests-initialize '(${TAG}) (or '(${PROFILER}) t))"
 
 # Re-indent all Evil code.