From 666097310d8f50b3b87971f81d2f75bbdbfc1a59 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Wed, 2 Sep 2020 12:55:46 +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 122db49ff..bbca1a52f 100755 --- a/clang/tools/clang-format/clang-format-diff.py +++ b/clang/tools/clang-format/clang-format-diff.py @@ -54,7 +54,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-10', 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 768acb3a5..a8d122d0a 100644 --- a/clang/tools/clang-format/clang-format.el +++ b/clang/tools/clang-format/clang-format.el @@ -37,7 +37,7 @@ :group 'tools) (defcustom clang-format-executable - (or (executable-find "clang-format") + (or (executable-find "clang-format-10") "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 1a615b170..89d33d7ec 100644 --- a/clang/tools/clang-format/clang-format.py +++ b/clang/tools/clang-format/clang-format.py @@ -48,7 +48,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-10' if vim.eval('exists("g:clang_format_path")') == "1": binary = vim.eval('g:clang_format_path') -- 2.30.2