diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/octave.el | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 78235d76879..021b0693654 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-07-04 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/octave.el (inferior-octave-mode): + Set comint-input-ring-size to a number (bug#17912). + 2014-07-03 Juri Linkov <juri@jurta.org> * desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro' diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index 3fdcec219d3..25b081545a3 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -747,9 +747,10 @@ Key bindings: (setq-local info-lookup-mode 'octave-mode) (setq-local eldoc-documentation-function 'octave-eldoc-function) - (setq comint-input-ring-file-name - (or (getenv "OCTAVE_HISTFILE") "~/.octave_hist") - comint-input-ring-size (or (getenv "OCTAVE_HISTSIZE") 1024)) + (setq-local comint-input-ring-file-name + (or (getenv "OCTAVE_HISTFILE") "~/.octave_hist")) + (setq-local comint-input-ring-size + (string-to-number (or (getenv "OCTAVE_HISTSIZE") "1024"))) (comint-read-input-ring t) (setq-local comint-dynamic-complete-functions inferior-octave-dynamic-complete-functions) |