Skip to content

Commit

Permalink
Update core-test submodule & Drop Emacs 26 support (#364)
Browse files Browse the repository at this point in the history
* Update core-test submodule

* Add fix for spaces_in_middle_key test

editorconfig/editorconfig-core-test#51

* Drop Emacs 26 support
  • Loading branch information
10sr authored Feb 19, 2025
1 parent 24f5b2b commit 72b8847
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 11 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/build.yaml
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
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
7 changes: 5 additions & 2 deletions editorconfig-core-handle.el
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
;; Author: EditorConfig Team <[email protected]>
;; 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

0 comments on commit 72b8847

Please sign in to comment.