company-eclim-executable: Pick up the value of eclim-executable, if present

diff --git a/company-eclim.el b/company-eclim.el
index 1f1beae9604e73c87d499044c04dab1cbb7f8bb4..5627f8e62c0f23058a3878cb25c1df79fc8a72dc 100644 (file)
--- a/company-eclim.el
+++ b/company-eclim.el
@@ -1,6 +1,6 @@
 ;;; company-eclim.el --- company-mode completion back-end for Eclim
 
-;; Copyright (C) 2009, 2011, 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2011, 2013, 2015  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -48,7 +48,9 @@
            (cl-return file)))))
 
 (defcustom company-eclim-executable
-  (or (executable-find "eclim") (company-eclim-executable-find))
+  (or (bound-and-true-p eclim-executable)
+      (executable-find "eclim")
+      (company-eclim-executable-find))
   "Location of eclim executable."
   :type 'file)