diff options
| -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 @@ | |||
| 1 | 2014-01-10 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/octave.el (octave-mode-menu): Don't assume eldoc is | ||
| 4 | loaded. | ||
| 5 | |||
| 1 | 2014-01-10 Anders Lindgren <andlind@gmail.com> | 6 | 2014-01-10 Anders Lindgren <andlind@gmail.com> |
| 2 | 7 | ||
| 3 | * follow.el (follow-cache-command-list): Include right-char and | 8 | * 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.") | |||
| 158 | (if (fboundp 'eldoc-post-insert-mode) | 158 | (if (fboundp 'eldoc-post-insert-mode) |
| 159 | 'eldoc-post-insert-mode | 159 | 'eldoc-post-insert-mode |
| 160 | 'eldoc-mode)) | 160 | 'eldoc-mode)) |
| 161 | :style toggle :selected (or eldoc-post-insert-mode eldoc-mode) | 161 | :style toggle :selected (or (bound-and-true-p eldoc-post-insert-mode) |
| 162 | (bound-and-true-p eldoc-mode)) | ||
| 162 | :help "Display function signatures after typing `SPC' or `('"] | 163 | :help "Display function signatures after typing `SPC' or `('"] |
| 163 | ["Delimiter Matching" show-paren-mode | 164 | ["Delimiter Matching" show-paren-mode |
| 164 | :style toggle :selected show-paren-mode | 165 | :style toggle :selected show-paren-mode |