company--posn-col-row: use `posn-col-row'

Fixes #175

diff --git a/company-tests.el b/company-tests.el
index afd41565381dca1b2eedfbcaf09fecd00d739df3..32231b718e91f018b854936993ff124f34c555f8 100644 (file)
--- a/company-tests.el
+++ b/company-tests.el
@@ -586,6 +586,15 @@
       (put-text-property (point-min) (point-max) 'line-prefix "  ")
       (should (= (company--column) 2)))))
 
+(ert-deftest company-column-with-tabs ()
+  :tags '(interactive)
+  (with-temp-buffer
+    (save-window-excursion
+      (set-window-buffer nil (current-buffer))
+      (insert "|\t|\t|\t(")
+      (let ((tab-width 8))
+        (should (= (company--column) 25))))))
+
 (ert-deftest company-plainify ()
   (let ((tab-width 8))
     (should (equal-including-properties

diff --git a/company.el b/company.el
index 239d16fa7096e82e0f490a76f096529432bba829..c70e615f31b2f26bb7a2dd1bb3a7b174e7b3c239 100644 (file)
--- a/company.el
+++ b/company.el
@@ -785,7 +785,7 @@ means that `company-mode' is always turned on except in `message-mode' buffers."
   (push 31415926 unread-command-events))
 
 (defun company--posn-col-row (pos)
-  (let* ((col-row (posn-actual-col-row pos))
+  (let* ((col-row (posn-col-row pos))
          (col (car col-row))
          (row (cdr col-row)))
     (when header-line-format