r255484 - clang-format: Fix style default for WebKit and Linux styles.

[Daniel Jasper via cfe-commits]

Author: djasper
Date: Mon Dec 14 02:24:16 2015
New Revision: 255484

URL: http://llvm.org/viewvc/llvm-project?rev=255484&view=rev
Log:
clang-format: Fix style default for WebKit and Linux styles.

Brought up in codereviews:
http://reviews.llvm.org/D15445
http://reviews.llvm.org/D15485

Modified:
    cfe/trunk/lib/Format/Format.cpp

Modified: cfe/trunk/lib/Format/Format.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=255484&r1=255483&r2=255484&view=diff
==============================================================================
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Mon Dec 14 02:24:16 2015
@@ -396,7 +396,6 @@ static FormatStyle expandPresets(const F
     Expanded.BraceWrapping.AfterClass = true;
     Expanded.BraceWrapping.AfterFunction = true;
     Expanded.BraceWrapping.AfterNamespace = true;
-    Expanded.BraceWrapping.BeforeElse = true;
     break;
   case FormatStyle::BS_Mozilla:
     Expanded.BraceWrapping.AfterClass = true;
@@ -427,7 +426,6 @@ static FormatStyle expandPresets(const F
     break;
   case FormatStyle::BS_WebKit:
     Expanded.BraceWrapping.AfterFunction = true;
-    Expanded.BraceWrapping.BeforeElse = true;
     break;
   default:
     break;