[Emacs-diffs] trunk r115958: * progmodes/octave.el (octave-mode-menu): Don't assume eldoc is loaded.

[Chong Yidong]

------------------------------------------------------------
revno: 115958
revision-id: address@hidden
parent: address@hidden
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2014-01-10 18:35:36 +0800
message:
  * progmodes/octave.el (octave-mode-menu): Don't assume eldoc is loaded.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/octave.el       
octavemod.el-20091113204419-o5vbwnq5f7feedwu-1028

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-10 09:30:43 +0000
+++ b/lisp/ChangeLog    2014-01-10 10:35:36 +0000
@@ -1,3 +1,8 @@
+2014-01-10  Chong Yidong  <address@hidden>
+
+       * progmodes/octave.el (octave-mode-menu): Don't assume eldoc is
+       loaded.
+
 2014-01-10  Anders Lindgren  <address@hidden>
 
        * follow.el (follow-cache-command-list): Include right-char and

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2014-01-01 07:43:34 +0000
+++ b/lisp/progmodes/octave.el  2014-01-10 10:35:36 +0000
@@ -158,7 +158,8 @@
                               (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