Merge remote-tracking branch 'origin/master' into vim-7.4.2170

1 files changed, 7 insertions, 3 deletions

diff --git a/src/clint.py b/src/clint.py
index ce31822ada..5174521fb8 100755
--- a/src/clint.py
+++ b/src/clint.py
@@ -571,7 +571,8 @@ class _CppLintState(object):
         for category, count in self.errors_by_category.items():
             sys.stderr.write('Category \'%s\' errors found: %d\n' %
                              (category, count))
-        sys.stderr.write('Total errors found: %d\n' % self.error_count)
+        if self.error_count:
+            sys.stderr.write('Total errors found: %d\n' % self.error_count)
 
     def SuppressErrorsFrom(self, fname):
         """Open file and read a list of suppressed errors from it"""
@@ -2268,11 +2269,14 @@ def CheckSpacing(filename, clean_lines, linenum, nesting_state, error):
                 # //!<  Header comment
                 # or they begin with multiple slashes followed by a space:
                 # //////// Header comment
+                # or they are Vim {{{ fold markers
                 match = (Search(r'[=/-]{4,}\s*$', line[commentend:]) or
                          Search(r'^/$', line[commentend:]) or
                          Search(r'^!< ', line[commentend:]) or
                          Search(r'^/< ', line[commentend:]) or
-                         Search(r'^/+ ', line[commentend:]))
+                         Search(r'^/+ ', line[commentend:]) or
+                         Search(r'^(?:\{{3}|\}{3})\d*(?: |$)',
+                                line[commentend:]))
                 if not match:
                     error(filename, linenum, 'whitespace/comments', 4,
                           'Should have a space between // and comment')
@@ -3575,7 +3579,7 @@ def main():
 if __name__ == '__main__':
     main()
 
-# vim: ts=4 sts=4 sw=4
+# vim: ts=4 sts=4 sw=4 foldmarker=▶,▲
 
 # Ignore "too complex" warnings when using pymode.
 # pylama:ignore=C901