From 4066c53654fa11fc2e72e4b3b7f4be9153fadc08 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Wed, 8 May 2013 00:29:53 +0000 Subject: Merging r181299: ------------------------------------------------------------------------ r181299 | djasper | 2013-05-07 02:25:29 -0700 (Tue, 07 May 2013) | 5 lines 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/branches/release_33@181380 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/clang-format/clang-format.el | 4 ++-- 1 file 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)) -- cgit v1.2.3-18-g5258