mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-21 06:55:39 +00:00
* lisp/editorconfig.el (editorconfig--get-indentation): Fix bug#73991
This commit is contained in:
parent
ed1d691184
commit
dd52839dd9
@ -437,8 +437,18 @@ heuristic for those modes not found there."
|
||||
(let ((style (gethash 'indent_style props))
|
||||
(size (gethash 'indent_size props))
|
||||
(tab_width (gethash 'tab_width props)))
|
||||
(when tab_width
|
||||
(setq tab_width (string-to-number tab_width)))
|
||||
(cond
|
||||
(tab_width (setq tab_width (string-to-number tab_width)))
|
||||
;; The EditorConfig spec is excessively eager to set `tab-width'
|
||||
;; even when not explicitly requested (bug#73991).
|
||||
;; As a trade-off, we accept `indent_style=tab' as a good enough hint.
|
||||
((and (equal style "tab") (editorconfig-string-integer-p size))
|
||||
(setq tab_width (string-to-number size))))
|
||||
|
||||
;; When users choose `indent_size=tab', they most likely prefer
|
||||
;; `indent_style=tab' as well.
|
||||
(when (and (null style) (equal size "tab"))
|
||||
(setq style "tab"))
|
||||
|
||||
(setq size
|
||||
(cond ((editorconfig-string-integer-p size)
|
||||
|
Loading…
Reference in New Issue
Block a user