[Emacs-diffs] emacs-24 r117344: * lisp/progmodes/octave.el (inferior-octave-mode):

[Stefan Monnier]

------------------------------------------------------------
revno: 117344
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17912
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-07-03 21:35:23 -0400
message:
  * lisp/progmodes/octave.el (inferior-octave-mode):
  Set comint-input-ring-size to a number.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/octave.el       
octavemod.el-20091113204419-o5vbwnq5f7feedwu-1028

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-03 23:48:24 +0000
+++ b/lisp/ChangeLog    2014-07-04 01:35:23 +0000
@@ -1,3 +1,8 @@
+2014-07-04  Stefan Monnier  <address@hidden>
+
+       * progmodes/octave.el (inferior-octave-mode):
+       Set comint-input-ring-size to a number (bug#17912).
+
 2014-07-03  Juri Linkov  <address@hidden>
 
        * desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro'

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2014-04-12 04:07:53 +0000
+++ b/lisp/progmodes/octave.el  2014-07-04 01:35:23 +0000
@@ -747,9 +747,10 @@
   (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)