-@@ -393,12 +399,16 @@
-
- " Expand tabs
- let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
-- let idx = stridx(s:expandedtab, "\t")
-- while idx >= 0
-- let i = &ts - ((idx + s:startcol - 1) % &ts)
-- let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '')
-- let idx = stridx(s:expandedtab, "\t")
-- endwhile
-+ if &et
-+ let idx = stridx(s:expandedtab, "\t")
-+ while idx >= 0
-+ let i = &ts - ((idx + s:startcol - 1) % &ts)
-+ let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '')
-+ let idx = stridx(s:expandedtab, "\t")
-+ endwhile
-+ else
-+ setlocal isprint+=9
-+ endif
+@@ -873,6 +879,7 @@
+ if s:settings.ignore_conceal || !s:concealinfo[0]
+ " Expand tabs
+ let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
++ if &expandtab
+ let s:offset = 0
+ let s:idx = stridx(s:expandedtab, "\t")
+ while s:idx >= 0
+@@ -895,6 +902,9 @@
+ let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
+ let s:idx = stridx(s:expandedtab, "\t")
+ endwhile
++ else
++ setlocal isprint+=9
++ end