branch: externals/realgud-jdb commit f86b7284ecf97d5087868c5309b27910e21d90df Author: rocky <r...@dustyfeet.com> Commit: rocky <r...@dustyfeet.com>
Administrivia ... * require Emacs 25 or later * remove deprecated function in shell script --- common.mk.in | 2 +- compute-lispdir.sh | 4 ++-- configure.ac | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common.mk.in b/common.mk.in index c28f493..032d0d7 100644 --- a/common.mk.in +++ b/common.mk.in @@ -19,6 +19,6 @@ short: EMACSLOADPATH=$(EMACSLOADPATH) $(EMACS) --batch \ $(AM_ELCFLAGS) $(ELCFLAGS) \ $$am__subdir_includes -L $(builddir) -L $(srcdir) \ - --eval "(defun byte-compile-dest-file (f) \"$@\")" \ + --eval "(defun byte-compile-dest-file-function (f) \"$@\")" \ --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \ else :; fi diff --git a/compute-lispdir.sh b/compute-lispdir.sh index 72e8c13..553b579 100755 --- a/compute-lispdir.sh +++ b/compute-lispdir.sh @@ -24,7 +24,7 @@ done for dir in $list ; do if [[ -d $dir ]] ; then case $dir in - */emacs/2[4-7]\.[0-9]/site-lisp) + */emacs/2[5-8]\.[0-9]/site-lisp) ((DEBUG)) && echo "versioned site lisp: $dir" echo "$dir" exit 0 @@ -35,7 +35,7 @@ done for dir in $list ; do if [[ -d $dir ]] ; then case $dir in - */emacs/2[4-7]\.[0-9]/site-lisp) + */emacs/2[5-8]\.[0-9]/site-lisp) ((DEBUG)) && echo "versioned site lisp: $dir" echo "$dir" exit 0 diff --git a/configure.ac b/configure.ac index b107d1c..c460a1d 100644 --- a/configure.ac +++ b/configure.ac @@ -10,9 +10,9 @@ AC_ARG_WITH(emacs, AC_HELP_STRING([--with-emacs], AC_MSG_NOTICE("Checking emacs version") $EMACS -batch -q --no-site-file -eval \ - '(if (<= emacs-major-version 23) + '(if (<= emacs-major-version 24) (progn - (error "You need GNU Emacs 24 or better.") + (error "You need GNU Emacs 25 or later.") (kill-emacs 1) ) )'