Accept markers in the data returned by c-a-p-f functions

Reported at http://lists.gnu.org/archive/html/help-gnu-emacs/2015-04/msg00297.html

diff --git a/company-capf.el b/company-capf.el
index 4962a26c0d8a4e1ac6512ba0c8f3247b48f7b54c..17b739b02b9a518a09eeb0a6553c83c6b0571a5f 100644 (file)
--- a/company-capf.el
+++ b/company-capf.el
@@ -1,6 +1,6 @@
 ;;; company-capf.el --- company-mode completion-at-point-functions back-end -*- lexical-binding: t -*-
 
-;; Copyright (C) 2013-2014  Free Software Foundation, Inc.
+;; Copyright (C) 2013-2015  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 
@@ -51,7 +51,7 @@
              (data (run-hook-wrapped 'completion-at-point-functions
                                      ;; Ignore misbehaving functions.
                                      #'completion--capf-wrapper 'optimist)))
-    (when (and (consp (cdr data)) (numberp (nth 1 data))) data)))
+    (when (and (consp (cdr data)) (integer-or-marker-p (nth 1 data))) data)))
 
 (defun company-capf (command &optional arg &rest _args)
   "`company-mode' back-end using `completion-at-point-functions'."