summaryrefslogtreecommitdiff
path: root/tools/clang-format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-05-07 09:25:29 +0000
committerDaniel Jasper <djasper@google.com>2013-05-07 09:25:29 +0000
commit8ee617e56492fc1c68f6dc115b20ead9c04c2fe1 (patch)
treea9b5469b85e1c5e89e704931744a195868cf9dca /tools/clang-format
parenta399f776ee29e099da33eaf7f9d585b4edc4b61d (diff)
downloadclang-8ee617e56492fc1c68f6dc115b20ead9c04c2fe1.tar.gz
clang-8ee617e56492fc1c68f6dc115b20ead9c04c2fe1.tar.bz2
clang-8ee617e56492fc1c68f6dc115b20ead9c04c2fe1.tar.xz
Fix clang-format emacs integration in last line.
Emacs seems to have a line that is just past the last character of the buffers content. This needs to be handled specially so that clang-format is not called with an invalid -offset. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@181299 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/clang-format')
-rw-r--r--tools/clang-format/clang-format.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/clang-format/clang-format.el b/tools/clang-format/clang-format.el
index 70504c9f3c..2c5546b241 100644
--- a/tools/clang-format/clang-format.el
+++ b/tools/clang-format/clang-format.el
@@ -19,8 +19,8 @@
(if mark-active
(setq beg (region-beginning)
end (region-end))
- (setq beg (line-beginning-position)
- end (line-end-position)))
+ (setq beg (min (line-beginning-position) (1- (point-max)))
+ end (min (line-end-position) (1- (point-max)))))
(call-process-region (point-min) (point-max) binary t t nil
"-offset" (number-to-string (1- beg))
"-length" (number-to-string (- end beg))