From 8bd622ef7ef571182a061068b94d38cd3ee0e2cb Mon Sep 17 00:00:00 2001
From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sun, 18 Jun 2017 18:12:15 +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 5e728f547..4584c6be3 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-3.9',
                       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 ca461444e..2890f1056 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.9")
       "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 5cb41fcfa..038b8c54f 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.9'
 if vim.eval('exists("g:clang_format_path")') == "1":
   binary = vim.eval('g:clang_format_path')
 
-- 
2.30.2