From ad6b4fc475d1e74b4a098a8cee90c7a16f958b73 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 21 May 2025 14:00:06 +0200 Subject: [PATCH] update editorconfig --- .../dir | 0 .../editorconfig-autoloads.el | 0 .../editorconfig-conf-mode.el | 0 .../editorconfig-core-handle.el | 9 ++++++--- .../editorconfig-core.el | 0 .../editorconfig-fnmatch.el | 0 .../editorconfig-pkg.el | 10 +++++----- .../editorconfig-tools.el | 0 .../editorconfig.el | 7 ++++--- .../editorconfig.info | 0 10 files changed, 15 insertions(+), 11 deletions(-) rename elpa/{editorconfig-20241027.1815 => editorconfig-20250219.1528}/dir (100%) rename elpa/{editorconfig-20241027.1815 => editorconfig-20250219.1528}/editorconfig-autoloads.el (100%) rename elpa/{editorconfig-20241027.1815 => editorconfig-20250219.1528}/editorconfig-conf-mode.el (100%) rename elpa/{editorconfig-20241027.1815 => editorconfig-20250219.1528}/editorconfig-core-handle.el (96%) rename elpa/{editorconfig-20241027.1815 => editorconfig-20250219.1528}/editorconfig-core.el (100%) rename elpa/{editorconfig-20241027.1815 => editorconfig-20250219.1528}/editorconfig-fnmatch.el (100%) rename elpa/{editorconfig-20241027.1815 => editorconfig-20250219.1528}/editorconfig-pkg.el (56%) rename elpa/{editorconfig-20241027.1815 => editorconfig-20250219.1528}/editorconfig-tools.el (100%) rename elpa/{editorconfig-20241027.1815 => editorconfig-20250219.1528}/editorconfig.el (99%) rename elpa/{editorconfig-20241027.1815 => editorconfig-20250219.1528}/editorconfig.info (100%) diff --git a/elpa/editorconfig-20241027.1815/dir b/elpa/editorconfig-20250219.1528/dir similarity index 100% rename from elpa/editorconfig-20241027.1815/dir rename to elpa/editorconfig-20250219.1528/dir diff --git a/elpa/editorconfig-20241027.1815/editorconfig-autoloads.el b/elpa/editorconfig-20250219.1528/editorconfig-autoloads.el similarity index 100% rename from elpa/editorconfig-20241027.1815/editorconfig-autoloads.el rename to elpa/editorconfig-20250219.1528/editorconfig-autoloads.el diff --git a/elpa/editorconfig-20241027.1815/editorconfig-conf-mode.el b/elpa/editorconfig-20250219.1528/editorconfig-conf-mode.el similarity index 100% rename from elpa/editorconfig-20241027.1815/editorconfig-conf-mode.el rename to elpa/editorconfig-20250219.1528/editorconfig-conf-mode.el diff --git a/elpa/editorconfig-20241027.1815/editorconfig-core-handle.el b/elpa/editorconfig-20250219.1528/editorconfig-core-handle.el similarity index 96% rename from elpa/editorconfig-20241027.1815/editorconfig-core-handle.el rename to elpa/editorconfig-20250219.1528/editorconfig-core-handle.el index 69eb45f0..588419fa 100644 --- a/elpa/editorconfig-20241027.1815/editorconfig-core-handle.el +++ b/elpa/editorconfig-20250219.1528/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) @@ -177,7 +180,7 @@ If CONF is not found return nil." nil) ;; Start of section - ((looking-at "\\[\\(.*\\)\\][ \t]*$") + ((looking-at "\\[\\(.*\\)\\][ \t]*\\(?:[#;].*\\)?$") (let ((newpattern (match-string 1))) (when pattern (push (make-editorconfig-core-handle-section @@ -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/elpa/editorconfig-20241027.1815/editorconfig-core.el b/elpa/editorconfig-20250219.1528/editorconfig-core.el similarity index 100% rename from elpa/editorconfig-20241027.1815/editorconfig-core.el rename to elpa/editorconfig-20250219.1528/editorconfig-core.el diff --git a/elpa/editorconfig-20241027.1815/editorconfig-fnmatch.el b/elpa/editorconfig-20250219.1528/editorconfig-fnmatch.el similarity index 100% rename from elpa/editorconfig-20241027.1815/editorconfig-fnmatch.el rename to elpa/editorconfig-20250219.1528/editorconfig-fnmatch.el diff --git a/elpa/editorconfig-20241027.1815/editorconfig-pkg.el b/elpa/editorconfig-20250219.1528/editorconfig-pkg.el similarity index 56% rename from elpa/editorconfig-20241027.1815/editorconfig-pkg.el rename to elpa/editorconfig-20250219.1528/editorconfig-pkg.el index 1d2ff3ab..a24ff203 100644 --- a/elpa/editorconfig-20241027.1815/editorconfig-pkg.el +++ b/elpa/editorconfig-20250219.1528/editorconfig-pkg.el @@ -1,10 +1,10 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "editorconfig" "20241027.1815" +(define-package "editorconfig" "20250219.1528" "EditorConfig Emacs Plugin." - '((emacs "26.1")) - :url "https://github.com/editorconfig/editorconfig-emacs" - :commit "24f5b2b1cd4e37adc245fb59f7edeb6872a707a4" - :revdesc "24f5b2b1cd4e" + '((emacs "27.2")) + :url "https://github.com/editorconfig/editorconfig-emacs#readme" + :commit "1a9942746cf5b10daae8962f380b5f2a459086f3" + :revdesc "1a9942746cf5" :keywords '("convenience" "editorconfig") :authors '(("EditorConfig Team" . "editorconfig@googlegroups.com")) :maintainers '(("EditorConfig Team" . "editorconfig@googlegroups.com"))) diff --git a/elpa/editorconfig-20241027.1815/editorconfig-tools.el b/elpa/editorconfig-20250219.1528/editorconfig-tools.el similarity index 100% rename from elpa/editorconfig-20241027.1815/editorconfig-tools.el rename to elpa/editorconfig-20250219.1528/editorconfig-tools.el diff --git a/elpa/editorconfig-20241027.1815/editorconfig.el b/elpa/editorconfig-20250219.1528/editorconfig.el similarity index 99% rename from elpa/editorconfig-20241027.1815/editorconfig.el rename to elpa/editorconfig-20250219.1528/editorconfig.el index fb2be8e0..c734dd6f 100644 --- a/elpa/editorconfig-20241027.1815/editorconfig.el +++ b/elpa/editorconfig-20250219.1528/editorconfig.el @@ -3,10 +3,10 @@ ;; Copyright (C) 2011-2024 EditorConfig Team ;; Author: EditorConfig Team -;; Package-Version: 20241027.1815 -;; Package-Revision: 24f5b2b1cd4e +;; Package-Version: 20250219.1528 +;; Package-Revision: 1a9942746cf5 ;; URL: https://github.com/editorconfig/editorconfig-emacs#readme -;; Package-Requires: ((emacs "26.1")) +;; Package-Requires: ((emacs "27.2")) ;; Keywords: convenience editorconfig ;; See @@ -295,6 +295,7 @@ This hook will be run even when there are no matching sections in (terra-mode terra-indent-level) (tcl-mode tcl-indent-level tcl-continued-indent-level) + (templ-ts-mode go-ts-mode-indent-offset js-indent-level) (toml-ts-mode toml-ts-mode-indent-offset) (typescript-mode typescript-indent-level) (typescript-ts-base-mode typescript-ts-mode-indent-offset) diff --git a/elpa/editorconfig-20241027.1815/editorconfig.info b/elpa/editorconfig-20250219.1528/editorconfig.info similarity index 100% rename from elpa/editorconfig-20241027.1815/editorconfig.info rename to elpa/editorconfig-20250219.1528/editorconfig.info -- 2.47.3