1 files changed, 8 insertions, 3 deletions
diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp
index 3cdc2863ab..f86f29d5b9 100644
--- a/lib/Rewrite/HTMLRewrite.cpp
+++ b/lib/Rewrite/HTMLRewrite.cpp
@@ -176,9 +176,14 @@ std::string html::EscapeText(const std::string& s, bool EscapeSpaces,
       break;
       
       case '\t':
-        if (ReplaceTabs)
-          for (unsigned i = 0; i < 4; ++i)
-            os << "&nbsp;";
+        if (ReplaceTabs) {
+          if (EscapeSpaces)
+            for (unsigned i = 0; i < 4; ++i)
+              os << "&nbsp;";
+          else
+            for (unsigned i = 0; i < 4; ++i)
+              os << " ";
+        }
         else 
           os << c;