]> code.delx.au - gnu-emacs/blobdiff - lisp/progmodes/cfengine.el
; Revert "Use eldoc-documentation-functions"
[gnu-emacs] / lisp / progmodes / cfengine.el
index ace012ff6458589b17ef2179fcf4b17ad9a66ac5..083021472041f8e52d130f1a09014b25c605d5c5 100644 (file)
@@ -1390,15 +1390,12 @@ to the action header."
                  (when buffer-file-name
                    (shell-quote-argument buffer-file-name)))))
 
-  (if (boundp 'eldoc-documentation-functions)
-      (add-hook 'eldoc-documentation-functions
-                #'cfengine3-documentation-function nil t)
-    ;; 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))
+  ;; 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)
 
   (add-hook 'completion-at-point-functions
             #'cfengine3-completion-function nil t)