clang-format: Add default fallback style.

Thanks to Michael Schlottke. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@235162 91177308-0d34-0410-b5e6-96231b3b80d8
johanst · Apr 17, 2015 · ab97523 · ab97523
1 parent e1907cb
commit ab97523
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp
@@ -3364,7 +3364,7 @@ namespace {
         searchForID(M, SearchDecls[I]);
       // FIXME: If none of the SearchDecls had local IDs in this module, can
       // we avoid searching any ancestor module files?
-      return false;
+      return Deserialized.empty();
     }
 
     ArrayRef<Decl *> getChain() const {

diff --git a/tools/clang-format/clang-format.py b/tools/clang-format/clang-format.py
@@ -34,6 +34,7 @@
 # a '.clang-format' or '_clang-format' file to indicate the style that should be
 # used.
 style = 'file'
+fallback_style = None
 if vim.eval('exists("g:clang_format_fallback_style")') == "1":
   fallback_style = vim.eval('g:clang_format_fallback_style')