company-capf: fix when company-point is nil

[gnu-emacs-elpa] / company-capf.el

diff --git a/company-capf.el b/company-capf.el
index 1a4342bf59d4912b284e072de666f43b0f4b7835..77479aeeec70937fcde83e44abb38519dc8364c5 100644 (file)
--- a/company-capf.el
+++ b/company-capf.el
@@ -104,7 +104,11 @@ Requires Emacs 24.1 or newer."
        (when f (funcall f arg))))
     (`annotation
      (save-excursion
-       (goto-char company-point)
+       ;; FIXME: `company-begin' sets `company-point' after calling
+       ;; `company--begin-new'.  We shouldn't rely on `company-point' here,
+       ;; better to cache the capf-data value instead.
+       (when company-point
+         (goto-char company-point))
        (let ((f (plist-get (nthcdr 4 (company--capf-data)) :annotation-function)))
          (when f (funcall f arg)))))
     (`require-match