diff options
| author | Chong Yidong <cyd@gnu.org> | 2014-01-10 18:35:36 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2014-01-10 18:35:36 +0800 |
| commit | cc33cac98a6891edfa5ccf2aee29da81071c0cd4 (patch) | |
| tree | aa4c4c51f951ee8a635d5abaa2df30925f534f54 | |
| parent | d9d836b5c4c1f435c9a972b8c7b89d819c236f36 (diff) | |
| download | emacs-cc33cac98a6891edfa5ccf2aee29da81071c0cd4.tar.gz | |
* progmodes/octave.el (octave-mode-menu): Don't assume eldoc is loaded.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/octave.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 46049b072e9..ee56c879347 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-01-10 Chong Yidong <cyd@gnu.org> + + * progmodes/octave.el (octave-mode-menu): Don't assume eldoc is + loaded. + 2014-01-10 Anders Lindgren <andlind@gmail.com> * follow.el (follow-cache-command-list): Include right-char and diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index 2ae0a02727f..e2ef492a9ad 100644 --- 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 |