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 6e707fc0fb6471ae12693cb888dc651f892a0d2f..49a03e1ecb23334cdfbfffe02661e024101a3759 100755 (executable)
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -92,7 +92,7 @@ def main():
     )
     parser.add_argument(
         "-binary",
-        default="clang-format",
+        default="clang-format-17",
         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 30ac7501afcb617febc2b5fc522f69ead9d721aa..85976f5e8841e8f8f85a5728f222f925c447639d 100644 (file)
--- a/clang/tools/clang-format/clang-format.el
+++ b/clang/tools/clang-format/clang-format.el
@@ -37,7 +37,7 @@
   :group 'tools)
 
 (defcustom clang-format-executable
-  (or (executable-find "clang-format")
+  (or (executable-find "clang-format-17")
       "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..367532d21bbc2961c19d2bcf8869dc774dce5b33 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-17"
 if vim.eval('exists("g:clang_format_path")') == "1":
     binary = vim.eval("g:clang_format_path")