[llvm-branch-commits] [cfe-branch] r319179 - Merging r311456:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Tue Nov 28 08:19:54 2017
New Revision: 319179

URL: http://llvm.org/viewvc/llvm-project?rev=319179&view=rev
Log:
Merging r311456:

------------------------------------------------------------------------
r311456 | krasimir | 2017-08-22 07:28:01 -0700 (Tue, 22 Aug 2017) | 13 lines

[clang-format] Fix lines regression in clang-format.py

Summary:
This patch fixes a regression after https://reviews.llvm.org/rL305665,
which updates the structure of the `lines` variable.

Reviewers: djasper

Reviewed By: djasper

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D37011
------------------------------------------------------------------------

Modified:
    cfe/branches/release_50/tools/clang-format/clang-format.py

Modified: cfe/branches/release_50/tools/clang-format/clang-format.py
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_50/tools/clang-format/clang-format.py?rev=319179&r1=319178&r2=319179&view=diff
==============================================================================
--- cfe/branches/release_50/tools/clang-format/clang-format.py (original)
+++ cfe/branches/release_50/tools/clang-format/clang-format.py Tue Nov 28 08:19:54 2017
@@ -62,7 +62,7 @@ def main():
 
   # Determine range to format.
   if vim.eval('exists("l:lines")') == '1':
-    lines = vim.eval('l:lines')
+    lines = ['-lines', vim.eval('l:lines')]
   elif vim.eval('exists("l:formatdiff")') == '1':
     with open(vim.current.buffer.name, 'r') as f:
       ondisk = f.read().splitlines();