[Emacs-diffs] master f7ba648: Fix a bug in cfengine3-mode

[Leo Liu]

branch: master
commit f7ba648def727053a2da7d71150a0ee991ec4f9e
Author: Leo Liu <address@hidden>
Commit: Leo Liu <address@hidden>

    Fix a bug in cfengine3-mode
    
    * progmodes/cfengine.el (cfengine3-mode): Handle nil
      eldoc-documentation-function.
---
 lisp/progmodes/cfengine.el |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 27784a5..108ccb6 100644
--- 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)