Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for Emacs 29 #81

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update for Emacs 29 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/run-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@ jobs:
strategy:
matrix:
# Cask does't support Emacs 24.
version: ['25.1', '25.2', '25.3', '26.1', '26.2', '26.3', '27.1', '27.2', '28.1', '28.2', 'snapshot']
version: ['25.1', '25.2', '25.3', '26.1', '26.2', '26.3', '27.1', '27.2', '28.1', '28.2', '29.1', 'snapshot']

steps:
- uses: actions/checkout@v3
- uses: purcell/setup-emacs@master
with:
version: ${{ matrix.version }}
- name: Run linters
# Indentation rules changed since 29.
if: ${{ startsWith(matrix.version, '29.') }}
run: ./scripts/run_linter.sh
- name: Run tests
run: ./scripts/run_test.sh
2 changes: 1 addition & 1 deletion kotlin-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ For argument BODY, see `save-mark-and-excursion'."
(define-key map (kbd "C-c C-c") 'kotlin-send-block)
(define-key map (kbd "C-c C-b") 'kotlin-send-buffer)
(define-key map [remap indent-new-comment-line]
#'kotlin-mode--indent-new-comment-line)
#'kotlin-mode--indent-new-comment-line)
map)
"Keymap for `kotlin-mode'.")

Expand Down
5 changes: 3 additions & 2 deletions scripts/run_linter_in_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
# Run linter in Docker. Used in Makefile.

# Cask does't support Emacs 24.
for version in 28 27 26 25 # 24
# Indentation rules changed since 29.
for version in 29 # 28 27 26 25 # 24
do
docker \
run \
Expand All @@ -13,7 +14,7 @@ do
--workdir="/src" \
--env=ELDEV_DIR=/src/.eldev \
--env=HOME=/tmp \
silex/emacs:${version} \
silex/emacs:${version}-ci-cask \
bash -c "/src/scripts/run_linter.sh" \
|| exit 1
done
Expand Down
4 changes: 2 additions & 2 deletions scripts/run_test_in_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Run tests in Docker. Used in Makefile.

# Cask does't support Emacs 24.
for version in 28 27 26 25 # 24
for version in 29 28 27 26 25 # 24
do
rm -f *.elc test/*.elc
rm -f *-autoloads.el
Expand All @@ -15,7 +15,7 @@ do
--workdir="/src" \
--env=ELDEV_DIR=/src/.eldev \
--env=HOME=/tmp \
silex/emacs:${version} \
silex/emacs:${version}-ci-cask \
bash -c "/src/scripts/run_test.sh" \
|| exit 1
done
Expand Down