From 7463365519967a01023fd1498198eace40406a7d Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Sun, 26 Aug 2018 13:00:14 +0100 Subject: [PATCH] clang-format-version Gbp-Pq: Name clang-format-version.diff --- clang/tools/clang-format/clang-format-diff.py | 2 +- clang/tools/clang-format/clang-format.el | 2 +- clang/tools/clang-format/clang-format.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py index ffa30e70..be1252d8 100755 --- a/clang/tools/clang-format/clang-format-diff.py +++ b/clang/tools/clang-format/clang-format-diff.py @@ -55,7 +55,7 @@ def main(): parser.add_argument('-style', help='formatting style to apply (LLVM, Google, Chromium, ' 'Mozilla, WebKit)') - parser.add_argument('-binary', default='clang-format', + parser.add_argument('-binary', default='clang-format-6.0', help='location of binary to use for clang-format') args = parser.parse_args() diff --git a/clang/tools/clang-format/clang-format.el b/clang/tools/clang-format/clang-format.el index 6c626e0b..341842a4 100644 --- a/clang/tools/clang-format/clang-format.el +++ b/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-6.0") "clang-format") "Location of the clang-format executable. diff --git a/clang/tools/clang-format/clang-format.py b/clang/tools/clang-format/clang-format.py index 5fe592a9..dbe6cca8 100644 --- a/clang/tools/clang-format/clang-format.py +++ b/clang/tools/clang-format/clang-format.py @@ -36,7 +36,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-6.0' if vim.eval('exists("g:clang_format_path")') == "1": binary = vim.eval('g:clang_format_path') -- 2.30.2