# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1535739157 0
# Node ID b0a3022c9a1d55df6a1c4eecdb7fdb7d991f2c19
# Parent  4f79770c440fb780ff709b2333fcc8ffd2aa7d24# Parent  1043163c84c73d226aea7c0557ca8af6e35e1f07
Merge.

diff -r 1043163c84c7 -r b0a3022c9a1d .hgsub
--- a/.hgsub	Fri Aug 31 14:08:11 2018 -0400
+++ b/.hgsub	Fri Aug 31 18:12:37 2018 +0000
@@ -25,7 +25,6 @@
 vim/bundle/rainbow-parentheses   = [git]https://github.com/kien/rainbow_parentheses.vim
 vim/bundle/repeat                = [git]https://github.com/tpope/vim-repeat
 vim/bundle/rhubarb               = [git]https://github.com/tpope/vim-rhubarb
-vim/bundle/scala                 = [git]git://github.com/derekwyatt/vim-scala
 vim/bundle/securemodelines       = [git]https://github.com/ciaranm/securemodelines
 vim/bundle/sexp                  = [git]https://github.com/guns/vim-sexp
 vim/bundle/shaderhighlight       = [git]https://github.com/vim-scripts/ShaderHighLight
diff -r 1043163c84c7 -r b0a3022c9a1d .hgsubstate
--- a/.hgsubstate	Fri Aug 31 14:08:11 2018 -0400
+++ b/.hgsubstate	Fri Aug 31 18:12:37 2018 +0000
@@ -25,7 +25,6 @@
 eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
 43d2678fa59d068c815d8298331c195e850ff5a7 vim/bundle/repeat
 848841083d5d4550b5ebbd3bd67dfb3e5146b64a vim/bundle/rhubarb
-e7640f26e56f0be344d60a6098e05d6928fd396d vim/bundle/scala
 10d6c6b52fcdd12f3ba457126f66fee4ccceec04 vim/bundle/securemodelines
 b4398689f7483b01684044ab6b55bf369744c9b3 vim/bundle/sexp
 e02c3e218c51c1e2ea1821a3fe412d4e09ca1502 vim/bundle/shaderhighlight
diff -r 1043163c84c7 -r b0a3022c9a1d scalastyle_config.xml
--- a/scalastyle_config.xml	Fri Aug 31 14:08:11 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-<scalastyle commentFilter="enabled">
- <name>Scalastyle standard configuration</name>
- <check class="org.scalastyle.file.FileTabChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.file.FileLengthChecker" level="warning" enabled="false">
-  <parameters>
-   <parameter name="maxFileLength"><![CDATA[800]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.file.HeaderMatchesChecker" level="warning" enabled="false">
-  <parameters>
-   <parameter name="header"><![CDATA[// Copyright (C) 2011-2012 the original author or authors.
-// See the LICENCE.txt file distributed with this work for additional
-// information regarding copyright ownership.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.SpacesAfterPlusChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.file.WhitespaceEndOfLineChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.SpacesBeforePlusChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.file.FileLineLengthChecker" level="warning" enabled="false">
-  <parameters>
-   <parameter name="maxLineLength"><![CDATA[160]]></parameter>
-   <parameter name="tabSize"><![CDATA[4]]></parameter>
-   <parameter name="ignoreImports"><![CDATA[false]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.ClassNamesChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.ObjectNamesChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.PackageObjectNamesChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="regex"><![CDATA[^[a-z][A-Za-z]*$]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.EqualsHashCodeChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.IllegalImportsChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.ParameterNumberChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="maxParameters"><![CDATA[8]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.MagicNumberChecker" level="warning" enabled="false">
-  <parameters>
-   <parameter name="ignore"><![CDATA[-1,0,1,2,3]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.ReturnChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.NullChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.NoCloneChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.NoFinalizeChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.CovariantEqualsChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.StructuralTypeChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.file.RegexChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="regex"><![CDATA[println]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.NumberOfTypesChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="maxTypes"><![CDATA[30]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.CyclomaticComplexityChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="maximum"><![CDATA[10]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.UppercaseLChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.SimplifyBooleanExpressionChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.IfBraceChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="singleLineAllowed"><![CDATA[true]]></parameter>
-   <parameter name="doubleLineAllowed"><![CDATA[false]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.MethodLengthChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="maxLength"><![CDATA[50]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.MethodNamesChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9]*(_=)?$]]></parameter>
-   <parameter name="ignoreRegex"><![CDATA[^$]]></parameter>
-   <parameter name="ignoreOverride"><![CDATA[false]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="maxMethods"><![CDATA[30]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="ignoreOverride"><![CDATA[false]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.file.NewLineAtEofChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.file.NoNewLineAtEofChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.WhileChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.VarFieldChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.VarLocalChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.RedundantIfChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.TokenChecker" level="warning" enabled="false">
-  <parameters>
-   <parameter name="regex"><![CDATA[println]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.DeprecatedJavaChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.EmptyClassChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.ClassTypeParameterChecker" level="warning" enabled="true">
-  <parameters>
-   <parameter name="regex"><![CDATA[^[A-Z_]$]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.UnderscoreImportChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.LowercasePatternMatchChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.MultipleStringLiteralsChecker" level="warning" enabled="false">
-  <parameters>
-   <parameter name="allowed"><![CDATA[2]]></parameter>
-   <parameter name="ignoreRegex"><![CDATA[^""$]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.ImportGroupingChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.NotImplementedErrorUsage" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.BlockImportChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.ProcedureDeclarationChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.ForBraceChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.SpaceAfterCommentStartChecker" level="warning" enabled="true"></check>
- <check class="org.scalastyle.scalariform.ScalaDocChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.DisallowSpaceAfterTokenChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.DisallowSpaceBeforeTokenChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.EnsureSingleSpaceAfterTokenChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.EnsureSingleSpaceBeforeTokenChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.scalariform.NonASCIICharacterChecker" level="warning" enabled="false"></check>
- <check class="org.scalastyle.file.IndentationChecker" level="warning" enabled="false">
-  <parameters>
-   <parameter name="tabSize"><![CDATA[2]]></parameter>
-  </parameters>
- </check>
- <check class="org.scalastyle.scalariform.FieldNamesChecker" level="warning" enabled="false">
-  <parameters>
-   <parameter name="regex"><![CDATA[^[a-z][A-Za-z]*$]]></parameter>
-  </parameters>
- </check>
-</scalastyle>