* progmodes/octave.el (octave-mode-menu): Don't assume eldoc is loaded.

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

diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 2ae0a02727f563620a0a835391d0a7f186dbabe1..e2ef492a9ad16654f1345f2b24f0543ab77055f3 100644 (file)
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -158,7 +158,8 @@ parenthetical grouping.")
                               (if (fboundp 'eldoc-post-insert-mode)
                                   'eldoc-post-insert-mode
                                 'eldoc-mode))
-     :style toggle :selected (or eldoc-post-insert-mode eldoc-mode)
+     :style toggle :selected (or (bound-and-true-p eldoc-post-insert-mode)
+                                (bound-and-true-p eldoc-mode))
      :help "Display function signatures after typing `SPC' or `('"]
     ["Delimiter Matching"           show-paren-mode
      :style toggle :selected show-paren-mode