Expand tabs according to config.

yi-editor · Sep 18, 2014 · e356fab · e356fab
1 parent b0d611c
commit e356fab
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/yi/src/library/Yi/Keymap/Vim/InsertMap.hs b/yi/src/library/Yi/Keymap/Vim/InsertMap.hs
@@ -18,8 +18,9 @@ import Yi.Keymap.Vim.EventUtils
 import Yi.Keymap.Vim.Motion
 import Yi.Keymap.Vim.Utils
 import Yi.Keymap.Vim.StateUtils
-import Yi.TextCompletion (completeWordB, CompletionScope(..))
+import Yi.Misc
 import Yi.Monad
+import Yi.TextCompletion (completeWordB, CompletionScope(..))
 
 defInsertMap :: [(String, Char)] -> [VimBinding]
 defInsertMap digraphs =
@@ -154,7 +155,11 @@ printableAction evs = do
                                 indentAsPreviousB
                             firstNonSpaceB
                         -- For testing purposes assume noexpandtab, tw=4
-                        "<Tab>" -> insertN $ replicate 4 ' '
+                        "<Tab>" -> do
+                            IndentSettings et _ts sw <- indentSettingsB
+                            if et
+                            then insertN (replicate sw ' ')
+                            else insertB '\t'
                         "<C-t>" -> shiftIndentOfRegionB 1 =<< regionOfB Line
                         "<C-d>" -> shiftIndentOfRegionB (-1) =<< regionOfB Line
                         "<C-e>" -> insertCharWithBelowB