]> granicus.if.org Git - clang/commitdiff
Fix clang-format emacs integration in last line.
authorDaniel Jasper <djasper@google.com>
Tue, 7 May 2013 09:25:29 +0000 (09:25 +0000)
committerDaniel Jasper <djasper@google.com>
Tue, 7 May 2013 09:25:29 +0000 (09:25 +0000)
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

tools/clang-format/clang-format.el

index 70504c9f3c0842ee5ef0ef16df4604edc2410e42..2c5546b241cc3484a6573fef8f012dcc5d86643e 100644 (file)
@@ -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))