From fb1e56cbe0937fd9bf74d04a6a72edb4a32424e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Aum=C3=BCller?= <aumuell@reserv.at>
Date: Fri, 15 Jan 2010 15:27:42 +0100
Subject: [PATCH] fakevim: use FakeVim indentation settings instead of
creator's
Merge-request: 2160
Reviewed-by: hjk <qtc-committer@nokia.com>
---
src/plugins/fakevim/fakevimhandler.cpp | 0
src/plugins/fakevim/fakevimplugin.cpp | 6 ++++--
2 files changed, 4 insertions(+), 2 deletions(-)
mode change 100755 => 100644 src/plugins/fakevim/fakevimhandler.cpp
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
old mode 100755
new mode 100644
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 0a4111cba00..9b54765fb46 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -649,8 +649,10 @@ void FakeVimPluginPrivate::indentRegion(int *amount, int beginLine, int endLine,
if (!bt)
return;
- TextEditor::TabSettings tabSettings =
- TextEditor::TextEditorSettings::instance()->tabSettings();
+ TextEditor::TabSettings tabSettings;
+ tabSettings.m_indentSize = theFakeVimSetting(ConfigShiftWidth)->value().toInt();
+ tabSettings.m_tabSize = theFakeVimSetting(ConfigTabStop)->value().toInt();
+ tabSettings.m_spacesForTabs = theFakeVimSetting(ConfigExpandTab)->value().toBool();
typedef SharedTools::Indenter<TextEditor::TextBlockIterator> Indenter;
Indenter &indenter = Indenter::instance();
indenter.setIndentSize(tabSettings.m_indentSize);
--
GitLab