summaryrefslogtreecommitdiffstats
path: root/clang/tools/clang-format/clang-format.el
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2015-11-16 12:38:56 +0000
committerDaniel Jasper <djasper@google.com>2015-11-16 12:38:56 +0000
commitda446770823be1b1d1562734e55da7c1a5f2579c (patch)
tree2bf41eaac2d5dcd6b8181359a850bbd26e037fe4 /clang/tools/clang-format/clang-format.el
parentbc09f39476723d319feaac18c948cd3498681136 (diff)
downloadbcm5719-llvm-da446770823be1b1d1562734e55da7c1a5f2579c.tar.gz
bcm5719-llvm-da446770823be1b1d1562734e55da7c1a5f2579c.zip
clang-format: Enable #include sorting by default.
This has seen quite some usage and I am not aware of any issues. Also add a style option to enable/disable include sorting. The existing command line flag can from now on be used to override whatever is set in the style. llvm-svn: 253202
Diffstat (limited to 'clang/tools/clang-format/clang-format.el')
-rw-r--r--clang/tools/clang-format/clang-format.el1
1 files changed, 0 insertions, 1 deletions
diff --git a/clang/tools/clang-format/clang-format.el b/clang/tools/clang-format/clang-format.el
index 6de45de70a6..ca461444e22 100644
--- a/clang/tools/clang-format/clang-format.el
+++ b/clang/tools/clang-format/clang-format.el
@@ -126,7 +126,6 @@ is no active region. If no style is given uses `clang-format-style'."
nil `(,temp-buffer ,temp-file) nil
"-output-replacements-xml"
- "-sort-includes"
"-assume-filename" (or (buffer-file-name) "")
"-style" style
"-offset" (number-to-string start)
OpenPOWER on IntegriCloud