diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2013-09-02 07:42:02 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2013-09-02 07:42:02 +0000 |
| commit | bc36e6e0996267a58dbbfdee6e975a77bb780599 (patch) | |
| tree | 2096005d35febd8d105372dce35842a36cf33d70 /clang/tools/clang-format/clang-format.el | |
| parent | 402ee64f134e5d7d1b4f98ae3a6cf63c5d295775 (diff) | |
| download | bcm5719-llvm-bc36e6e0996267a58dbbfdee6e975a77bb780599.tar.gz bcm5719-llvm-bc36e6e0996267a58dbbfdee6e975a77bb780599.zip | |
Switch the default mode for clang-format to '-file'. Make 'LLVM' the
fallback syntax used when we fail to find a '.clang-format' file. Adjust
variable names appropriately.
Update the editor integration pieces that specify a '-style' option to
specify it as '-style=file'. I left the functionality in place because
even if the preferred method is to use '.clang-format' files, this way
if someone needs to clobber the style in their editor we show how to do
so in these examples.
Also check in a '.clang-format' file for Clang to ensure that separate
checkouts and builds of Clang from LLVM can still get the nice
formatting. =] This unfortunately required nuking the test for the
absence of a '.clang-format' file as now the directory happening to be
under your clang source tree will cause there to always be a file. ;]
llvm-svn: 189741
Diffstat (limited to 'clang/tools/clang-format/clang-format.el')
| -rw-r--r-- | clang/tools/clang-format/clang-format.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/tools/clang-format/clang-format.el b/clang/tools/clang-format/clang-format.el index b0131ed3194..531635e8ecf 100644 --- a/clang/tools/clang-format/clang-format.el +++ b/clang/tools/clang-format/clang-format.el @@ -36,7 +36,7 @@ (let* ((orig-windows (get-buffer-window-list (current-buffer))) (orig-window-starts (mapcar #'window-start orig-windows)) (orig-point (point)) - (style "LLVM")) + (style "file")) (unwind-protect (call-process-region (point-min) (point-max) clang-format-binary t t nil "-offset" (number-to-string (1- begin)) |

