scratch/emacs-editorconfig b6ebc07af19 355/364: Remove support for `editorconfig-override-*-local-variables`

[Stefan Monnier]

branch: scratch/emacs-editorconfig
commit b6ebc07af199f2f057d0a6749f016208f3dbfda4
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    Remove support for `editorconfig-override-*-local-variables`
    
    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.
    
    * editorconfig.el (editorconfig-override-file-local-variables)
    (editorconfig-override-dir-local-variables): Remove custom vars.
    (editorconfig--should-set): Presume they were nil.
    
    * ert-tests/editorconfig-tests.el (test-local-variables):
    Adjust accordingly.
---
 lisp/editorconfig.el | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/lisp/editorconfig.el b/lisp/editorconfig.el
index 63878de6d8c..0f2cbd07f96 100644
--- a/lisp/editorconfig.el
+++ b/lisp/editorconfig.el
@@ -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))