diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2016-07-18 02:17:06 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2016-07-18 02:17:06 +0300 |
| commit | 6dc0bafd5915b01a341cc0efbc744abd73163872 (patch) | |
| tree | 144cbae0699d60ecde3569407043d5c853a20713 /lisp/progmodes/octave.el | |
| parent | 02ca5db040b57ca4a36c317fcb3fb56f43ab371e (diff) | |
| download | emacs-6dc0bafd5915b01a341cc0efbc744abd73163872.tar.gz emacs-6dc0bafd5915b01a341cc0efbc744abd73163872.tar.bz2 emacs-6dc0bafd5915b01a341cc0efbc744abd73163872.zip | |
; Revert "Use eldoc-documentation-functions"
This reverts commit 001d88b62ecb8163a148656acb103b354ce7613a.
It doesn't have the consensus, as evidenced by
http://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00138.html
Diffstat (limited to 'lisp/progmodes/octave.el')
| -rw-r--r-- | lisp/progmodes/octave.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index b9a86e7bbcd..4f223f2f3cc 100644 --- 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")) |