Skip to content

Commit aaf97a1

Browse files
committed
replace cask with eldev
... also fix regex error found by `eldev lint`
1 parent debb48c commit aaf97a1

File tree

10 files changed

+40
-136
lines changed

10 files changed

+40
-136
lines changed

.dir-locals.el

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
;;; For more information see (info "(emacs) Directory Variables")
33

44
((emacs-lisp-mode
5-
(elisp-lint-ignored-validators . ("fill-column"))
65
(fill-column . 78)
7-
(indent-tabs-mode)))
8-
9-
6+
(indent-tabs-mode)
7+
(elisp-lint-ignored-validators . ("fill-column"))))

.emacs/dependencies.el

Lines changed: 0 additions & 15 deletions
This file was deleted.

.emacs/init.el

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/check.yml

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,37 @@ name: check
22

33
on:
44
pull_request:
5+
paths-ignore:
6+
- '**.md'
57
push:
8+
paths-ignore:
9+
- '**.md'
610

711
jobs:
812
check:
913
runs-on: ubuntu-latest
1014
strategy:
11-
fail-fast: false
1215
matrix:
1316
emacs_version:
14-
- 26.1
15-
- 26.2
16-
- 26.3
17-
- 27.1
1817
- 27.2
19-
- 28.1
2018
- 28.2
21-
- 29.1
22-
- 29.2
2319
- 29.3
20+
- 30.2
2421
steps:
25-
- uses: actions/checkout@v2
26-
- uses: purcell/setup-emacs@master
27-
with:
28-
version: ${{ matrix.emacs_version }}
29-
- uses: leotaku/elisp-check@master
22+
23+
- name: Set up Emacs
24+
uses: jcs090218/setup-emacs@master
3025
with:
31-
# check: melpa
32-
file: abs-mode.el
26+
version: ${{matrix.emacs_version}}
27+
28+
- name: Install Eldev
29+
uses: emacs-eldev/setup-eldev@v1
30+
31+
- name: Check out the source code
32+
uses: actions/checkout@v4
33+
34+
- name: Test the project
35+
run: |
36+
eldev -p -dtT doctor
37+
# eldev -p -dtT lint # complains about too-long lines, ignoring .dir-locals.el
38+
eldev -p -dtT test

.gitignore

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
# generated files
55
abs-mode-autoloads.el
6-
.cask
7-
.emacs/elpa/
8-
.emacs/quelpa/
9-
.emacs/.emacs-custom.el
10-
.elpa
6+
7+
# Added automatically by ‘eldev init’.
8+
/.eldev
9+
/Eldev-local

Cask

Lines changed: 0 additions & 8 deletions
This file was deleted.

Eldev

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
; -*- mode: emacs-lisp; lexical-binding: t -*-
2+
3+
(eldev-use-package-archive 'gnu-elpa)
4+
(eldev-use-package-archive 'melpa)
5+
(eldev-use-plugin 'autoloads)
6+
(eldev-use-plugin 'maintainer)
7+
(setq eldev-main-fileset '("abs-mode.el")) ; ignore ob-abs.el for now
8+
(setq eldev-project-main-file "abs-mode.el") ; eldev doctor complains otherwise

Makefile

Lines changed: 0 additions & 27 deletions
This file was deleted.

abs-mode.el

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
;;; abs-mode.el --- Major mode for the modeling language Abs -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2010-2022 Rudolf Schlatte
3+
;; Copyright (C) 2010-2022, 2026 Rudolf Schlatte
44

55
;; Author: Rudi Schlatte <rudi@constantly.at>
66
;; URL: https://github.com/abstools/abs-mode
77
;; Version: 1.7
8-
;; Package-Requires: ((emacs "26.1") (erlang "2.8") (maude-mode "0.3") (flymake "1.0") (yasnippet "0.14.0"))
8+
;; Package-Requires: ((emacs "27.1") (erlang "2.8") (maude-mode "0.3") (flymake "1.0") (yasnippet "0.14.0"))
99
;; Keywords: languages
1010

1111
;; This program is free software; you can redistribute it and/or modify
@@ -244,7 +244,7 @@ base model.")
244244
(list (concat "\\(" abs--id-regexp "\\)[[:space:]]*(") 1
245245
'abs-function-name-face)
246246
(cons (concat "\\(" abs--id-regexp "\\)") 'abs-variable-name-face)
247-
(list "\\<\\(# \w+\\)\\>" 1 'font-lock-warning-face t))
247+
(list "\\<\\(# \\w+\\)\\>" 1 'font-lock-warning-face t))
248248
"Abs keywords.")
249249

250250
;;; cc-mode wants different fontification levels, but we only offer one.
@@ -347,7 +347,7 @@ base model.")
347347
(defvar abs--outline-level (lambda () (1+ (/ (current-indentation) abs-indent))))
348348

349349
(defun abs--read-backend ()
350-
(interactive)
350+
"Prompt the user to choose a backend."
351351
(let ((backend-name (completing-read "Backend: " abs--backends nil t nil nil abs-backend)))
352352
(intern-soft backend-name)))
353353
;;; Minimal auto-insert mode support

ob-abs.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; ob-abs.el --- org-babel functions for Abs -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2018 Rudolf Schlatte
3+
;; Copyright (C) 2018, 2026 Rudolf Schlatte
44

55
;; Author: Rudi Schlatte <rudi@constantly.at>
66
;; URL: https://github.com/abstools/abs-mode

0 commit comments

Comments
 (0)