(inferior-octave-startup): Ensure -i and --no-line-editing are passed

to Octave by including them here rather than storing them in
inferior-octave-startup-args.

diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index 6f235c0f02ffc10a88440984d1870361e393c223..aa3e8a2c134d27e244fb822530457ee85ff02307 100644 (file)
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -52,7 +52,7 @@ startup."
                 file)
   :group 'octave-inferior)
 
-(defcustom inferior-octave-startup-args '("-i" "--no-line-editing")
+(defcustom inferior-octave-startup-args nil
   "*List of command line arguments for the inferior Octave process.
 For example, for suppressing the startup message and using `traditional'
 mode, set this to (\"-q\" \"--traditional\")."
@@ -182,7 +182,8 @@ startup file, `~/.emacs-octave'."
               (substring inferior-octave-buffer 1 -1)
               inferior-octave-buffer
               inferior-octave-program
-              inferior-octave-startup-args)))
+              (append (list "-i" "--no-line-editing")
+                      inferior-octave-startup-args))))
     (set-process-filter proc 'inferior-octave-output-digest)
     (setq comint-ptyp process-connection-type
          inferior-octave-process proc