diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1d58bb76..e6d64f35 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 diff --git a/Eask b/Eask index 3ac3e5f2..aa384368 100644 --- a/Eask +++ b/Eask @@ -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 diff --git a/core-test b/core-test index 772112ad..7d75ceb5 160000 --- a/core-test +++ b/core-test @@ -1 +1 @@ -Subproject commit 772112adb7aec5fffedf869d0d5a54c8374a0547 +Subproject commit 7d75ceb5bd2e01de40fcb2d1ef91411f8cf4a402 diff --git a/editorconfig-core-handle.el b/editorconfig-core-handle.el index 69eb45f0..a0635cb6 100644 --- a/editorconfig-core-handle.el +++ b/editorconfig-core-handle.el @@ -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) @@ -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) diff --git a/editorconfig.el b/editorconfig.el index 29a4f783..74f68614 100644 --- a/editorconfig.el +++ b/editorconfig.el @@ -5,7 +5,7 @@ ;; Author: EditorConfig Team ;; 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