Don't reset company-begin-with-marker if nil.

diff --git a/company.el b/company.el
index 7bbf4e5b070e1491ca98f1711feca80978e5bf68..1c6346096c38bf5a1aa3c50bcc535f688ab8f834 100644 (file)
--- a/company.el
+++ b/company.el
@@ -1417,7 +1417,8 @@ To show the number next to the candidates in some back-ends, enable
   (remove-hook 'company-completion-finished-hook company-callback t)
   (remove-hook 'company-completion-cancelled-hook 'company-remove-callback t)
   (remove-hook 'company-completion-finished-hook 'company-remove-callback t)
-  (set-marker company-begin-with-marker nil))
+  (when company-begin-with-marker
+    (set-marker company-begin-with-marker nil)))
 
 (defun company-begin-backend (backend &optional callback)
   "Start a completion at point using BACKEND."