Mercurial > octave

changeset 29630:60315909c884

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* octave.cc (application::init): Allow --interactive with --server.
author John W. Eaton <jwe@octave.org>
date Fri, 07 May 2021 13:12:35 -0400
parents 93c8df989ea0
children dddf60b33de6
files libinterp/octave.cc
diffstat 1 files changed, 0 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave.cc	Fri Apr 02 19:53:26 2021 +0200
+++ b/libinterp/octave.cc	Fri May 07 13:12:35 2021 -0400
@@ -419,15 +419,6 @@
           }
       }
 
-    if (m_options.server ())
-      {
-        if (m_options.forced_interactive ())
-          {
-            std::cerr << "error: --server and --forced-interactive are mutually exclusive options" << std::endl;
-            octave_print_terse_usage_and_exit ();
-          }
-      }
-
     m_is_octave_program = ((m_have_script_file || m_have_eval_option_code)
                            && ! m_options.persist ()
                            && ! m_options.traditional ());