Skip to content

Commit 46c04c4

Browse files
committed
Merge pull request #445 from gracjan/pr-resurrect-emacs23
Resurrect Emacs23 support
2 parents 11e46b3 + ec534e6 commit 46c04c4

File tree

6 files changed

+2927
-3
lines changed

6 files changed

+2927
-3
lines changed

.travis.yml

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: emacs-lisp
22

33
env:
44
matrix:
5+
- EMACS=emacs23
56
- EMACS=emacs24
67
- EMACS=emacs-snapshot
78

@@ -11,6 +12,10 @@ matrix:
1112
- EMACS=emacs-snapshot
1213

1314
install:
15+
- if [ "$EMACS" = "emacs23" ]; then
16+
sudo apt-get update -qq &&
17+
sudo apt-get install -qq emacs23-gtk emacs23-el;
18+
fi
1419
- if [ "$EMACS" = "emacs24" ]; then
1520
sudo add-apt-repository -y ppa:cassou/emacs &&
1621
sudo apt-get update -qq &&

Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ GIT_VERSION = $(shell git describe --tags --match 'v[0-9]*' --long --dirty | sed
33

44
INSTALL_INFO = install-info
55
EMACS = emacs
6-
EFLAGS =
6+
EFLAGS = --eval "(if (< emacs-major-version 24) \
7+
(add-to-list 'load-path (expand-file-name \"tests/compat\")) \
8+
(setq byte-compile-error-on-warn t))"
9+
710
BATCH = $(EMACS) $(EFLAGS) --batch -Q -L .
811
SUBST_ATAT = sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g;s/@GIT_VERSION@/$(GIT_VERSION)/g;s/@@VERSION@@/$(VERSION)/g;s/@VERSION@/$(VERSION)/g'
912

@@ -61,7 +64,6 @@ ELCHECKS=$(addprefix check-, $(ELFILES:.el=))
6164

6265
%.elc: %.el
6366
@$(BATCH) \
64-
--eval "(setq byte-compile-error-on-warn t)" \
6567
-f batch-byte-compile $*.el
6668

6769
.PHONY: all compile info clean check $(ELCHECKS) elpa package

0 commit comments

Comments
 (0)