procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Remove support for editorconfig-override-*-local-variables

Browse source 
With the Emacs-30 hooks we can't easily override file-local settings
and we can't easily control whether we override dir-local settings,
so we remove support for those config vars.

* lisp/editorconfig.el (editorconfig-override-file-local-variables)
(editorconfig-override-dir-local-variables): Remove custom vars.
(editorconfig--should-set): Presume they were nil.
This commit is contained in:
Stefan Monnier 2024-06-17 10:54:25 -04:00
parent 3f90253dae
commit 8cfa6fe801
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/editorconfig.el
View file

@ -237,16 +237,6 @@ number - `lisp-indent-offset' is not set only if indent_size is
equal to this number. For example, if this is set to 2,
`lisp-indent-offset' will not be set only if indent_size is 2.")
(defcustom editorconfig-override-file-local-variables t
"Non-nil means editorconfig will override file local variable values."
:type 'boolean
:group 'editorconfig)
(defcustom editorconfig-override-dir-local-variables t
"Non-nil means editorconfig will override values defined in dir-locals.el ."
:type 'boolean
:group 'editorconfig)
(define-error 'editorconfig-error
"Error thrown from editorconfig lib")
@ -293,13 +283,11 @@ See `editorconfig-lisp-use-default-indent' for details."
symbol
size)
:debug)
(when (and (not editorconfig-override-file-local-variables)
(assq symbol file-local-variables-alist))
(when (assq symbol file-local-variables-alist)
(cl-return-from editorconfig--should-set
nil))
(when (and (not editorconfig-override-dir-local-variables)
(assq symbol dir-local-variables-alist))
(when (assq symbol dir-local-variables-alist)
(cl-return-from editorconfig--should-set
nil))