; Revert "Use eldoc-documentation-functions"

[gnu-emacs] / lisp / progmodes / octave.el

diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index b9a86e7bbcd0ffe1f43b1e81fe68e947686e5914..4f223f2f3cc06cde94e3dbfe3dad850346609547 100644 (file)
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -596,7 +596,8 @@ Key bindings:
   (add-hook 'before-save-hook 'octave-sync-function-file-names nil t)
   (setq-local beginning-of-defun-function 'octave-beginning-of-defun)
   (and octave-font-lock-texinfo-comment (octave-font-lock-texinfo-comment))
-  (add-hook 'eldoc-documentation-functions 'octave-eldoc-function nil t)
+  (add-function :before-until (local 'eldoc-documentation-function)
+                'octave-eldoc-function)
 
   (easy-menu-add octave-mode-menu))
 
@@ -732,7 +733,7 @@ Key bindings:
   (setq font-lock-defaults '(inferior-octave-font-lock-keywords nil nil))
 
   (setq-local info-lookup-mode 'octave-mode)
-  (add-hook 'eldoc-documentation-functions 'octave-eldoc-function nil t)
+  (setq-local eldoc-documentation-function 'octave-eldoc-function)
 
   (setq-local comint-input-ring-file-name
               (or (getenv "OCTAVE_HISTFILE") "~/.octave_hist"))