From 1d005327216fb1adcaa8c5ef1b607671f5a4ed01 Mon Sep 17 00:00:00 2001
From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Wed, 30 Oct 2024 21:56:13 +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 3a74b90e73..8e0725a38b 100755
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -93,7 +93,7 @@ def main():
     )
     parser.add_argument(
         "-binary",
-        default="clang-format",
+        default="clang-format-19",
         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 f43bf063c6..ff8ed4b3b3 100644
--- a/clang/tools/clang-format/clang-format.el
+++ b/clang/tools/clang-format/clang-format.el
@@ -38,7 +38,7 @@
   :group 'tools)
 
 (defcustom clang-format-executable
-  (or (executable-find "clang-format")
+  (or (executable-find "clang-format-19")
       "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 28e0d14a55..a2d22dc1d8 100644
--- a/clang/tools/clang-format/clang-format.py
+++ b/clang/tools/clang-format/clang-format.py
@@ -49,7 +49,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-19"
 if vim.eval('exists("g:clang_format_path")') == "1":
     binary = vim.eval("g:clang_format_path")
 
-- 
2.30.2