From b64fcedd82f188e7951585c6dda5efc5f4a497b2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 11:24:31 +0200
Subject: Count only increments in indent, also respect ftplugin settings

---
 ftdetect/polyglot.vim | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'ftdetect')

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 69934c48..83198ebc 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2733,7 +2733,7 @@ if !has_key(s:disabled_packages, 'autoindent')
       else
         let spaces_minus_tabs += 1
         let indent = len(matchstr(line, '^ *'))
-        let indent_inc = abs(indent - prev_indent)
+        let indent_inc = indent - prev_indent
 
         if indent_inc > 0 && lineno == next_indent_lineno
           if has_key(indents, indent_inc)
@@ -2771,14 +2771,9 @@ if !has_key(s:disabled_packages, 'autoindent')
       return
     endif
 
-    if &expandtab
-      " Make tabstop to be synchronized with shiftwidth by default
-      " Some plugins are using &shiftwidth directly or accessing &tabstop
-      if &tabstop != 8 || &shiftwidth == 0
-        let &shiftwidth = &tabstop
-      else
-        let &tabstop = &shiftwidth
-      endif
+    " Do not autodetect indent if language sets it
+    if &l:shiftwidth != &g:shiftwidth
+      return
     endif
 
     let b:sleuth_culprit = expand("<afile>:p")
-- 
cgit v1.2.3