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 0a2c24743678d0d9928f2a020942901720061372..00436cbc706b4f234a991793de467dc58d57a10c 100755 (executable)
--- 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 f43bf063c6297038165fcb154ecd82e0df9bb139..e7e29242c15d0d6db7cee289fb16d2ae4ee0f356 100644 (file)
--- 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 28e0d14a552fd158eba4f2ed33e4f4ff15a45fc8..1c146ba793a4f828c4eabad6a60161a85047d501 100644 (file)
--- 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")