Index: tools/clang-format/clang-format.py
===================================================================
--- tools/clang-format/clang-format.py	(revision 235137)
+++ tools/clang-format/clang-format.py	(working copy)
@@ -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')