Index: llvm-toolchain-snapshot_3.4~svn188146/clang/tools/clang-format/clang-format.py =================================================================== --- llvm-toolchain-snapshot_3.4~svn188146.orig/clang/tools/clang-format/clang-format.py 2013-08-11 10:01:37.348734638 +0200 +++ llvm-toolchain-snapshot_3.4~svn188146/clang/tools/clang-format/clang-format.py 2013-08-11 10:01:37.348734638 +0200 @@ -24,7 +24,7 @@ import vim # Change this to the full path if clang-format is not on the path. -binary = 'clang-format' +binary = 'clang-format-3.4' # Change this to format according to other formatting styles (see # clang-format -help) Index: llvm-toolchain-snapshot_3.4~svn188146/clang/tools/clang-format/clang-format-diff.py =================================================================== --- llvm-toolchain-snapshot_3.4~svn188146.orig/clang/tools/clang-format/clang-format-diff.py 2013-08-11 10:01:37.348734638 +0200 +++ llvm-toolchain-snapshot_3.4~svn188146/clang/tools/clang-format/clang-format-diff.py 2013-08-11 10:01:37.348734638 +0200 @@ -28,7 +28,7 @@ # Change this to the full path if clang-format is not on the path. -binary = 'clang-format' +binary = 'clang-format-3.4' def getOffsetLength(filename, line_number, line_count): Index: llvm-toolchain-snapshot_3.4~svn188146/clang/tools/clang-format/clang-format.el =================================================================== --- llvm-toolchain-snapshot_3.4~svn188146.orig/clang/tools/clang-format/clang-format.el 2013-08-11 10:01:37.348734638 +0200 +++ llvm-toolchain-snapshot_3.4~svn188146/clang/tools/clang-format/clang-format.el 2013-08-11 10:01:37.348734638 +0200 @@ -13,7 +13,7 @@ ;; *Location of the clang-format binary. If it is on your PATH, a full path name ;; need not be specified. -(defvar clang-format-binary "clang-format") +(defvar clang-format-binary "clang-format-3.4") (defun clang-format-region () "Use clang-format to format the currently active region."