From 2d10d2d80a091e4a4ef06d59c0b45ac2ad9d35ce Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 26 Apr 2026 19:47:15 +0200 Subject: [PATCH] update editorconfig --- elpa/editorconfig-20260118.718/README-elpa | 8 ++++ .../dir | 0 .../editorconfig-autoloads.el | 46 ++++++++++--------- .../editorconfig-conf-mode.el | 0 .../editorconfig-core-handle.el | 13 ++---- .../editorconfig-core.el | 0 .../editorconfig-fnmatch.el | 0 .../editorconfig-pkg.el | 6 +-- .../editorconfig-tools.el | 0 .../editorconfig.el | 30 ++++++------ .../editorconfig.info | 0 11 files changed, 57 insertions(+), 46 deletions(-) create mode 100644 elpa/editorconfig-20260118.718/README-elpa rename elpa/{editorconfig-20251221.650 => editorconfig-20260118.718}/dir (100%) rename elpa/{editorconfig-20251221.650 => editorconfig-20260118.718}/editorconfig-autoloads.el (74%) rename elpa/{editorconfig-20251221.650 => editorconfig-20260118.718}/editorconfig-conf-mode.el (100%) rename elpa/{editorconfig-20251221.650 => editorconfig-20260118.718}/editorconfig-core-handle.el (95%) rename elpa/{editorconfig-20251221.650 => editorconfig-20260118.718}/editorconfig-core.el (100%) rename elpa/{editorconfig-20251221.650 => editorconfig-20260118.718}/editorconfig-fnmatch.el (100%) rename elpa/{editorconfig-20251221.650 => editorconfig-20260118.718}/editorconfig-pkg.el (74%) rename elpa/{editorconfig-20251221.650 => editorconfig-20260118.718}/editorconfig-tools.el (100%) rename elpa/{editorconfig-20251221.650 => editorconfig-20260118.718}/editorconfig.el (97%) rename elpa/{editorconfig-20251221.650 => editorconfig-20260118.718}/editorconfig.info (100%) diff --git a/elpa/editorconfig-20260118.718/README-elpa b/elpa/editorconfig-20260118.718/README-elpa new file mode 100644 index 00000000..8f22acf7 --- /dev/null +++ b/elpa/editorconfig-20260118.718/README-elpa @@ -0,0 +1,8 @@ +EditorConfig helps developers define and maintain consistent +coding styles between different editors and IDEs. + +The EditorConfig project consists of a file format for defining +coding styles and a collection of text editor plugins that enable +editors to read the file format and adhere to defined styles. +EditorConfig files are easily readable and they work nicely with +version control systems. diff --git a/elpa/editorconfig-20251221.650/dir b/elpa/editorconfig-20260118.718/dir similarity index 100% rename from elpa/editorconfig-20251221.650/dir rename to elpa/editorconfig-20260118.718/dir diff --git a/elpa/editorconfig-20251221.650/editorconfig-autoloads.el b/elpa/editorconfig-20260118.718/editorconfig-autoloads.el similarity index 74% rename from elpa/editorconfig-20251221.650/editorconfig-autoloads.el rename to elpa/editorconfig-20260118.718/editorconfig-autoloads.el index 05255f7c..6e835171 100644 --- a/elpa/editorconfig-20251221.650/editorconfig-autoloads.el +++ b/elpa/editorconfig-20260118.718/editorconfig-autoloads.el @@ -11,16 +11,16 @@ ;;; Generated autoloads from editorconfig.el -(defvar editorconfig-mode nil "\ -Non-nil if Editorconfig mode is enabled. +(defvar editorconfig-mode nil +"Non-nil if Editorconfig mode is enabled. See the `editorconfig-mode' command for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `editorconfig-mode'.") (custom-autoload 'editorconfig-mode "editorconfig" nil) -(autoload 'editorconfig-mode "editorconfig" "\ -Toggle EditorConfig feature. +(autoload 'editorconfig-mode "editorconfig" +"Toggle EditorConfig feature. To disable EditorConfig in some buffers, modify `editorconfig-exclude-modes' or `editorconfig-exclude-regexps'. @@ -40,8 +40,8 @@ The mode's hook is called both when the mode is enabled and when it is disabled. (fn &optional ARG)" t) -(autoload 'editorconfig-version "editorconfig" "\ -Get EditorConfig version as string. +(autoload 'editorconfig-version "editorconfig" +"Get EditorConfig version as string. If called interactively or if SHOW-VERSION is non-nil, show the version in the echo area and the messages buffer. @@ -52,18 +52,22 @@ version in the echo area and the messages buffer. ;;; Generated autoloads from editorconfig-conf-mode.el -(autoload 'editorconfig-conf-mode "editorconfig-conf-mode" "\ -Major mode for editing .editorconfig files. +(autoload 'editorconfig-conf-mode "editorconfig-conf-mode" +"Major mode for editing .editorconfig files. -(fn)" t) +In addition to any hooks its parent mode `conf-unix-mode' might have +run, this mode runs the hook `editorconfig-conf-mode-hook', as the +final or penultimate step during initialization. + +\\{editorconfig-conf-mode-map}" t) (add-to-list 'auto-mode-alist '("\\.editorconfig\\'" . editorconfig-conf-mode)) (register-definition-prefixes "editorconfig-conf-mode" '("editorconfig-conf-mode-")) ;;; Generated autoloads from editorconfig-core.el -(autoload 'editorconfig-core-get-nearest-editorconfig "editorconfig-core" "\ -Return path to .editorconfig file that is closest to DIRECTORY. +(autoload 'editorconfig-core-get-nearest-editorconfig "editorconfig-core" +"Return path to .editorconfig file that is closest to DIRECTORY. (fn DIRECTORY)") (register-definition-prefixes "editorconfig-core" '("editorconfig-core-")) @@ -81,25 +85,25 @@ Return path to .editorconfig file that is closest to DIRECTORY. ;;; Generated autoloads from editorconfig-tools.el -(autoload 'editorconfig-apply "editorconfig-tools" "\ -Get and apply EditorConfig properties to current buffer. +(autoload 'editorconfig-apply "editorconfig-tools" +"Get and apply EditorConfig properties to current buffer. This function does not respect the values of `editorconfig-exclude-modes' and `editorconfig-exclude-regexps' and always applies available properties. Use `editorconfig-mode-apply' instead to make use of these variables." t) -(autoload 'editorconfig-mode-apply "editorconfig-tools" "\ -Get and apply EditorConfig properties to current buffer. +(autoload 'editorconfig-mode-apply "editorconfig-tools" +"Get and apply EditorConfig properties to current buffer. This function does nothing when the major mode is listed in `editorconfig-exclude-modes', or variable `buffer-file-name' matches any of regexps in `editorconfig-exclude-regexps'." t) -(autoload 'editorconfig-find-current-editorconfig "editorconfig-tools" "\ -Find the closest .editorconfig file for current file." t) -(autoload 'editorconfig-display-current-properties "editorconfig-tools" "\ -Display EditorConfig properties extracted for current buffer." t) +(autoload 'editorconfig-find-current-editorconfig "editorconfig-tools" +"Find the closest .editorconfig file for current file." t) +(autoload 'editorconfig-display-current-properties "editorconfig-tools" +"Display EditorConfig properties extracted for current buffer." t) (defalias 'describe-editorconfig-properties #'editorconfig-display-current-properties) -(autoload 'editorconfig-format-buffer "editorconfig-tools" "\ -Format buffer according to .editorconfig indent_style and indent_width." t) +(autoload 'editorconfig-format-buffer "editorconfig-tools" +"Format buffer according to .editorconfig indent_style and indent_width." t) ;;; End of scraped data diff --git a/elpa/editorconfig-20251221.650/editorconfig-conf-mode.el b/elpa/editorconfig-20260118.718/editorconfig-conf-mode.el similarity index 100% rename from elpa/editorconfig-20251221.650/editorconfig-conf-mode.el rename to elpa/editorconfig-20260118.718/editorconfig-conf-mode.el diff --git a/elpa/editorconfig-20251221.650/editorconfig-core-handle.el b/elpa/editorconfig-20260118.718/editorconfig-core-handle.el similarity index 95% rename from elpa/editorconfig-20251221.650/editorconfig-core-handle.el rename to elpa/editorconfig-20260118.718/editorconfig-core-handle.el index 588419fa..fda04202 100644 --- a/elpa/editorconfig-20251221.650/editorconfig-core-handle.el +++ b/elpa/editorconfig-20260118.718/editorconfig-core-handle.el @@ -169,10 +169,7 @@ If CONF is not found return nil." ;; nil when pattern not appeared yet, "" when pattern is empty ("[]") (pattern nil) ;; Alist of properties for current PATTERN - (props ()) - - ;; Current line num - (current-line-number 1)) + (props ())) (while (not (eobp)) (skip-chars-forward " \t\f") (cond @@ -190,7 +187,7 @@ If CONF is not found return nil." (setq props nil) (setq pattern newpattern))) - ((looking-at "\\([^=: \t][^=:]*\\)[ \t]*[=:][ \t]*\\(.*?\\)[ \t]*$") + ((looking-at "\\([^=: \n\t][^=:\n]*\\)[ \t]*[=:][ \t]*\\(.*?\\)[ \t]*$") (let ((key (downcase (string-trim (match-string 1)))) (value (match-string 2))) (if pattern @@ -200,12 +197,10 @@ If CONF is not found return nil." top-props)))) (t (error "Error while reading config file: %s:%d:\n %s\n" - conf current-line-number + conf (line-number-at-pos) (buffer-substring-no-properties (line-beginning-position) (line-end-position))))) - (setq current-line-number (1+ current-line-number)) - (goto-char (point-min)) - (forward-line (1- current-line-number))) + (forward-line 1)) (when pattern (push (make-editorconfig-core-handle-section :name pattern diff --git a/elpa/editorconfig-20251221.650/editorconfig-core.el b/elpa/editorconfig-20260118.718/editorconfig-core.el similarity index 100% rename from elpa/editorconfig-20251221.650/editorconfig-core.el rename to elpa/editorconfig-20260118.718/editorconfig-core.el diff --git a/elpa/editorconfig-20251221.650/editorconfig-fnmatch.el b/elpa/editorconfig-20260118.718/editorconfig-fnmatch.el similarity index 100% rename from elpa/editorconfig-20251221.650/editorconfig-fnmatch.el rename to elpa/editorconfig-20260118.718/editorconfig-fnmatch.el diff --git a/elpa/editorconfig-20251221.650/editorconfig-pkg.el b/elpa/editorconfig-20260118.718/editorconfig-pkg.el similarity index 74% rename from elpa/editorconfig-20251221.650/editorconfig-pkg.el rename to elpa/editorconfig-20260118.718/editorconfig-pkg.el index 71c8ff24..6e9dfc3f 100644 --- a/elpa/editorconfig-20251221.650/editorconfig-pkg.el +++ b/elpa/editorconfig-20260118.718/editorconfig-pkg.el @@ -1,10 +1,10 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "editorconfig" "20251221.650" +(define-package "editorconfig" "20260118.718" "EditorConfig Emacs Plugin." '((emacs "27.2")) :url "https://github.com/editorconfig/editorconfig-emacs#readme" - :commit "6783cb2a9fb82dc152e633e2e40162c150a4e818" - :revdesc "6783cb2a9fb8" + :commit "1e9931d5f38a8d8cb8a92cf726d64696550bfc95" + :revdesc "1e9931d5f38a" :keywords '("convenience" "editorconfig") :authors '(("EditorConfig Team" . "editorconfig@googlegroups.com")) :maintainers '(("EditorConfig Team" . "editorconfig@googlegroups.com"))) diff --git a/elpa/editorconfig-20251221.650/editorconfig-tools.el b/elpa/editorconfig-20260118.718/editorconfig-tools.el similarity index 100% rename from elpa/editorconfig-20251221.650/editorconfig-tools.el rename to elpa/editorconfig-20260118.718/editorconfig-tools.el diff --git a/elpa/editorconfig-20251221.650/editorconfig.el b/elpa/editorconfig-20260118.718/editorconfig.el similarity index 97% rename from elpa/editorconfig-20251221.650/editorconfig.el rename to elpa/editorconfig-20260118.718/editorconfig.el index aa11efa2..3a8e50e4 100644 --- a/elpa/editorconfig-20251221.650/editorconfig.el +++ b/elpa/editorconfig-20260118.718/editorconfig.el @@ -3,8 +3,8 @@ ;; Copyright (C) 2011-2024 EditorConfig Team ;; Author: EditorConfig Team -;; Package-Version: 20251221.650 -;; Package-Revision: 6783cb2a9fb8 +;; Package-Version: 20260118.718 +;; Package-Revision: 1e9931d5f38a ;; URL: https://github.com/editorconfig/editorconfig-emacs#readme ;; Package-Requires: ((emacs "27.2")) ;; Keywords: convenience editorconfig @@ -838,17 +838,21 @@ F is that function, and FILENAME and ARGS are arguments passed to F." (defun editorconfig--get-coding-system (&optional _size) "Return the coding system to use according to EditorConfig. Meant to be used on `auto-coding-functions'." - (when (and (stringp auto-coding-file-name) - (file-name-absolute-p auto-coding-file-name) - ;; Don't recurse infinitely. - (not (member auto-coding-file-name - editorconfig--getting-coding-system))) - (let* ((editorconfig--getting-coding-system - (cons auto-coding-file-name editorconfig--getting-coding-system)) - (props (editorconfig-call-get-properties-function - auto-coding-file-name))) - (editorconfig-merge-coding-systems (gethash 'end_of_line props) - (gethash 'charset props))))) + ;; Not only we don't want that an error in the `.editorconfig' file + ;; prevents opening a file but we don't want an error to be dropped on + ;; the floor by some `ignore-errors' higher up. + (with-demoted-errors "EditorConfig: %S" + (when (and (stringp auto-coding-file-name) + (file-name-absolute-p auto-coding-file-name) + ;; Don't recurse infinitely. + (not (member auto-coding-file-name + editorconfig--getting-coding-system))) + (let* ((editorconfig--getting-coding-system + (cons auto-coding-file-name editorconfig--getting-coding-system)) + (props (editorconfig-call-get-properties-function + auto-coding-file-name))) + (editorconfig-merge-coding-systems (gethash 'end_of_line props) + (gethash 'charset props)))))) ;;;###autoload (define-minor-mode editorconfig-mode diff --git a/elpa/editorconfig-20251221.650/editorconfig.info b/elpa/editorconfig-20260118.718/editorconfig.info similarity index 100% rename from elpa/editorconfig-20251221.650/editorconfig.info rename to elpa/editorconfig-20260118.718/editorconfig.info -- 2.47.3