blob: b8146634902bfaa81aad9a4410846c29ef1ea499 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.py
===================================================================
--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/clang-format/clang-format.py
+++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.py
@@ -25,7 +25,7 @@ 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.
-binary = 'clang-format'
+binary = 'clang-format-3.8'
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path')
Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format-diff.py
===================================================================
--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/clang-format/clang-format-diff.py
+++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format-diff.py
@@ -32,7 +32,7 @@ import sys
# Change this to the full path if clang-format is not on the path.
-binary = 'clang-format'
+binary = 'clang-format-3.8'
def main():
Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.el
===================================================================
--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/clang-format/clang-format.el
+++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.el
@@ -36,7 +36,7 @@
:group 'tools)
(defcustom clang-format-executable
- (or (executable-find "clang-format")
+ (or (executable-find "clang-format-3.8")
"clang-format")
"Location of the clang-format executable.
|
