From f1ddaf13dd7f5c64874ba87abc313b60737e333e Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Sun, 12 Mar 2017 08:49:18 +0000 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 9e02bb09..cc135ffb 100755 --- a/clang/tools/clang-format/clang-format-diff.py +++ b/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(): diff --git a/clang/tools/clang-format/clang-format.el b/clang/tools/clang-format/clang-format.el index ca461444..1ef7fdf3 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-3.8") "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 5cb41fcf..eacc59de 100644 --- a/clang/tools/clang-format/clang-format.py +++ b/clang/tools/clang-format/clang-format.py @@ -34,7 +34,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') -- 2.30.2