refresh of the patch

This commit is contained in:
Sylvestre Ledru 2014-11-04 12:18:45 +00:00
parent feae1e1159
commit 3c0778f311

View File

@ -1,21 +1,21 @@
Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.py Index: llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/tools/clang-format/clang-format.py 2013-10-29 12:26:23.002137599 +0100 --- llvm-toolchain-snapshot_3.6~svn221256.orig/clang/tools/clang-format/clang-format.py
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.py 2013-10-29 12:26:23.002137599 +0100 +++ llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format.py
@@ -24,7 +24,7 @@ @@ -25,7 +25,7 @@ import vim
import vim
# set g:clang_format_path to the path to clang-format if it is not on the path
# Change this to the full path if clang-format is not on the path. # Change this to the full path if clang-format is not on the path.
-binary = 'clang-format' -binary = 'clang-format'
+binary = 'clang-format-3.5' +binary = 'clang-format-3.6'
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path')
# Change this to format according to other formatting styles. See the output of Index: llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format-diff.py
# 'clang-format --help' for a list of supported styles. The default looks for
Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format-diff.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/tools/clang-format/clang-format-diff.py 2013-10-29 12:26:23.002137599 +0100 --- llvm-toolchain-snapshot_3.6~svn221256.orig/clang/tools/clang-format/clang-format-diff.py
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format-diff.py 2013-10-29 12:26:23.002137599 +0100 +++ llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format-diff.py
@@ -31,7 +31,7 @@ @@ -32,7 +32,7 @@ import sys
# Change this to the full path if clang-format is not on the path. # Change this to the full path if clang-format is not on the path.
@ -24,10 +24,10 @@ Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-form
def main(): def main():
Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.el Index: llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format.el
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/tools/clang-format/clang-format.el 2013-10-29 12:26:23.002137599 +0100 --- llvm-toolchain-snapshot_3.6~svn221256.orig/clang/tools/clang-format/clang-format.el
+++ llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.el 2013-10-29 12:26:23.002137599 +0100 +++ llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format.el
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
;; *Location of the clang-format binary. If it is on your PATH, a full path name ;; *Location of the clang-format binary. If it is on your PATH, a full path name