Merge branch 'master' of github.com:leoliu/ggtags

[gnu-emacs-elpa] / packages / company / company-clang.el

diff --git a/packages/company/company-clang.el b/packages/company/company-clang.el
index 942745026cda37c0cc23622f4407d89cb07a81ec..787ecef6eaa6e87d88115a099e72e3002cb06dcb 100644 (file)
--- a/packages/company/company-clang.el
+++ b/packages/company/company-clang.el
@@ -196,7 +196,12 @@ or automatically through a custom `company-clang-prefix-guesser'."
     (format "%s:%d:%d"
             (if (company-clang--auto-save-p) buffer-file-name "-")
             (line-number-at-pos)
-            (1+ (current-column)))))
+            (1+ (length
+                 (encode-coding-region
+                  (line-beginning-position)
+                  (point)
+                  'utf-8
+                  t))))))
 
 (defsubst company-clang--build-complete-args (pos)
   (append '("-cc1" "-fsyntax-only" "-code-completion-macros")