Fix a bug in cfengine3-mode

* progmodes/cfengine.el (cfengine3-mode): Handle nil
  eldoc-documentation-function.

diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 27784a503bae897c15dd4c6d3568bc8f8400665a..108ccb654c46416715cc632720ae489816b1bb7e 100644 (file)
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -1390,6 +1390,10 @@ to the action header."
                  (when buffer-file-name
                    (shell-quote-argument buffer-file-name)))))
 
+  ;; For emacs < 25.1 where `eldoc-documentation-function' defaults to
+  ;; nil.
+  (or eldoc-documentation-function
+      (setq-local eldoc-documentation-function #'ignore))
   (add-function :before-until (local 'eldoc-documentation-function)
                 #'cfengine3-documentation-function)