r22195 - in /branches/double_rotor: ./ prompt/interpreter.py -- February 17, 2014 - 09:25

Author: bugman
Date: Mon Feb 17 09:25:36 2014
New Revision: 22195

URL: http://svn.gna.org/viewcvs/relax?rev=22195&view=rev
Log:
Merged revisions 22191 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r22191 | tlinnet | 2014-02-14 15:19:58 +0100 (Fri, 14 Feb 2014) | 6 lines
  
  Fix for the user function intro flag.
  
  Fix for sr #3117, (https://gna.org/support/?3117) - Functionality to 
inspect interactively after running script - The equivalence to python -i
  
  It should be turned on for the script so you see the "relax>" messages, and 
then turned off again for the prompt so that
  the user function text and "relax>" is not printed out twice.
........

Modified:
    branches/double_rotor/   (props changed)
    branches/double_rotor/prompt/interpreter.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 17 09:25:36 2014
@@ -1,1 +1,1 @@
-/trunk:1-22189
+/trunk:1-22194

Modified: branches/double_rotor/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/prompt/interpreter.py?rev=22195&r1=22194&r2=22195&view=diff
==============================================================================
--- branches/double_rotor/prompt/interpreter.py (original)
+++ branches/double_rotor/prompt/interpreter.py Mon Feb 17 09:25:36 2014
@@ -276,7 +276,16 @@
 
         # Execute the script and go into prompt if the interactive flag -p 
--prompt is given at startup.
         if script_file and status.prompt:
+            # Turn on the user function intro flag.
+            status.uf_intro = True
+
+            # Run the script.
             run_script(intro=self.__intro_string, local=locals(), 
script_file=script_file, show_script=self.__show_script, 
raise_relax_error=self.__raise_relax_error)
+
+            # Turn off the user function intro flag.
+            status.uf_intro = False
+
+            # Go to the prompt.
             prompt(intro=None, local=locals())
 
         # Go to the prompt.