Skip to content

Update core-test submodule & Drop Emacs 26 support #364

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

Merged
merged 3 commits into from
Feb 19, 2025
Merged

Update core-test submodule & Drop Emacs 26 support #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a7a82f
Update core-test submodule
10sr Dec 18, 2024
55ee4bd
Add fix for spaces_in_middle_key test
10sr Feb 18, 2025
b399699
Drop Emacs 26 support
10sr Feb 19, 2025
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
6 changes: 0 additions & 6 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ jobs:
- "29.3"
experimental: [false]
include:
- os: ubuntu-latest
emacs-version: "26.3"
experimental: false
- os: windows-latest
emacs-version: "26.3"
experimental: false
- os: ubuntu-latest
emacs-version: "27.2"
experimental: false
Expand Down
2 changes: 1 addition & 1 deletion Eask
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
(source "gnu")
(source "melpa")

(depends-on "emacs" "26.1")
(depends-on "emacs" "27.2")
(depends-on "nadvice")

(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432
2 changes: 1 addition & 1 deletion core-test
Open in desktop
Submodule core-test updated 10 files
+1 −1 cmake/almostcat.cmake
+1 −1 cmake/ec_sort.cmake
+1 −1 cmake/runandsort.cmake
+0 −2 filetree/CMakeLists.txt
+8 −0 glob/CMakeLists.txt
+0 −2 meta/CMakeLists.txt
+1 −1 meta/sample.cmake
+11 −1 parser/CMakeLists.txt
+9 −0 parser/empty_values.in
+8 −0 parser/whitespace.in
7 changes: 5 additions & 2 deletions editorconfig-core-handle.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
;;; Code:

(require 'cl-lib)
(when (eval-when-compile (version< emacs-version "28.1"))
;; For `string-trim'
(require 'subr-x))

(require 'editorconfig-fnmatch)

Expand Down Expand Up @@ -187,8 +190,8 @@ If CONF is not found return nil."
(setq props nil)
(setq pattern newpattern)))

((looking-at "\\([^=: \t]+\\)[ \t]*[=:][ \t]*\\(.*?\\)[ \t]*$")
(let ((key (downcase (match-string 1)))
((looking-at "\\([^=: \t][^=:]*\\)[ \t]*[=:][ \t]*\\(.*?\\)[ \t]*$")
(let ((key (downcase (string-trim (match-string 1))))
(value (match-string 2)))
(if pattern
(push `(,key . ,value)
Expand Down
2 changes: 1 addition & 1 deletion editorconfig.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
;; Author: EditorConfig Team <editorconfig@googlegroups.com>
;; Version: 0.11.0
;; URL: https://github.com/editorconfig/editorconfig-emacs#readme
;; Package-Requires: ((emacs "26.1"))
;; Package-Requires: ((emacs "27.2"))
;; Keywords: convenience editorconfig

;; See
Expand Down