From 89c96799ce2d7bd6fd28544a6082ac86240065c3 Mon Sep 17 00:00:00 2001 From: Nikolaj Schumacher Date: Sun, 19 Apr 2009 00:14:02 +0200 Subject: [PATCH] Handle uninitialized back-ends. --- company.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/company.el b/company.el index 6884bd586..f17d7a740 100644 --- a/company.el +++ b/company.el @@ -493,8 +493,10 @@ The work-around consists of adding a newline.") (functionp backend)) (if (ignore-errors (funcall backend 'init) t) (put backend 'company-init t) + (put backend 'company-init 'failed) (message "Company back-end '%s' could not be initialized" - backend)) + backend) + nil) (mapc 'company-init-backend backend))) ;;;###autoload @@ -901,7 +903,9 @@ keymap during active completions (`company-active-map'): (if (or (symbolp backend) (functionp backend)) (when (or (not (symbolp backend)) - (get backend 'company-init)) + (eq t (get backend 'company-init)) + (unless (get backend 'company-init) + (company-init-backend backend))) (funcall backend 'prefix)) (company--multi-backend-adapter backend 'prefix))) (when prefix -- 2.39.2