Merge branch 'master' into initialization

Conflicts:
	sx-request.el

1 files changed, 24 insertions, 0 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..e812d5b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,24 @@
+# This makefile runs the tests as Travis runs them.  Be sure to test
+# locally before you push if you are under the impression that the
+# patch should work.  This will cut down on the number of commits in
+# the repository that, essentially, patch patches.
+#
+# To test Emacs 24.1, for example, use
+#
+#     make 24.1
+#
+# To test on all versions, of course, simply use
+#
+#     make
+#
+# or
+#
+#     make all
+#
+
+all: 24.1 24.2 24.3
+
+%:
+	evm install emacs-$@-bin || true
+	emacs --version
+	emacs --batch -L . -l ert -l test/tests.el -f ert-run-tests-batch-and-exit