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 1f6ff0fe295f88d165e79b6571c22fd36f4561f2..2b575fb753e865b2d653dda4c03abca23d1b9fa7 100755 (executable)
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -63,7 +63,7 @@ def main():
                       'fallback in case clang-format is invoked with'
                       '-style=file, but can not find the .clang-format'
                       'file to use.')
-  parser.add_argument('-binary', default='clang-format',
+  parser.add_argument('-binary', default='clang-format-16',
                       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 4e6daa82d4ade6551be8b93992bbedcf0bf790df..06e8ca92b4be61514e678e06994d5d4ddd028f4a 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-16")
       "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 7933dbcfadd88bed2a8d2a06ba17897ebd2f110b..c6878b72e7266619e0b14c95c88f228c8b479050 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-16'
 if vim.eval('exists("g:clang_format_path")') == "1":
   binary = vim.eval('g:clang_format_path')