diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2025-02-24 22:23:04 +0100 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2025-02-24 22:23:04 +0100 |
| commit | 2b88d76b5890acc7262604cb613dfcdfaba1568b (patch) | |
| tree | afb3e4cb1b2d0c293bf81b1473f3c1fb1ce798c4 | |
| parent | 25c1a7ca62d12e1d0b32c8129f73deb69bb94c03 (diff) | |
| parent | f3293ed0122d82c41c0c8397e935395213b2c76e (diff) | |
Merge branch 'main' into emacs-31
| -rw-r--r-- | .github/workflows/makefile.yml | 2 | ||||
| -rw-r--r-- | compat-30.el | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index ef81ed5..f74d357 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: # See https://github.com/purcell/setup-emacs/blob/master/.github/workflows/test.yml - emacs-version: [24.4, 24.5, 25.1, 25.2, 25.3, 26.1, 26.2, 26.3, 27.1, 27.2, 28.1, 28.2, 29.1, 29.2, 29.3, 29.4, release-snapshot] + emacs-version: [24.4, 24.5, 25.1, 25.2, 25.3, 26.1, 26.2, 26.3, 27.1, 27.2, 28.1, 28.2, 29.1, 29.2, 29.3, 29.4, 30.1] # release-snapshot, snapshot steps: - uses: actions/checkout@v4 - uses: purcell/setup-emacs@master diff --git a/compat-30.el b/compat-30.el index 8d59cdf..938cbcb 100644 --- a/compat-30.el +++ b/compat-30.el @@ -33,8 +33,7 @@ buffer contents as untrusted. This variable might be subject to change without notice." :local permanent) -;; TODO Update to 30.1 as soon as the Emacs emacs-30 branch version bumped -(compat-version "30.0.50") +(compat-version "30.1") ;;;; Defined in lread.c |