From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Mon, 23 Sep 2024 11:23:31 +0000 (+0200)
Subject: clang-format-version
X-Git-Tag: archive/raspbian/1%18.1.8-12+rpi1~95
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=01cc1dd6b828d02901d92485e3fd50b5ceddce78;p=llvm-toolchain-18.git

clang-format-version


Gbp-Pq: Name clang-format-version.diff
---

diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py
index 0a2c247436..00436cbc70 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-18",
         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..e7e29242c1 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-18")
       "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..1c146ba793 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-18"
 if vim.eval('exists("g:clang_format_path")') == "1":
     binary = vim.eval("g:clang_format_path")