[rkward-cvs] SF.net SVN: rkward: [1627] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 1627
          http://svn.sourceforge.net/rkward/?rev=1627&view=rev
Author:   tfry
Date:     2007-03-18 16:57:28 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
Cleanups and local() adjustments

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/00saveload/load/load/code.php
    trunk/rkward/rkward/plugins/00saveload/load/source/code.php
    trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp

Removed Paths:
-------------
    trunk/rkward/rkward/plugins/00means/
    trunk/rkward/rkward/plugins/00saveload/load/readtable/

Modified: trunk/rkward/rkward/plugins/00saveload/load/load/code.php
===================================================================
--- trunk/rkward/rkward/plugins/00saveload/load/load/code.php	2007-03-18 23:39:50 UTC (rev 1626)
+++ trunk/rkward/rkward/plugins/00saveload/load/load/code.php	2007-03-18 23:57:28 UTC (rev 1627)
@@ -1,17 +1,14 @@
 <?
-	function preprocess () {
-	}
+function preprocess () {
+}
 	
-	function calculate () {
+function calculate () {
 ?>
-load (file="<? getRK("file"); ?>")
+load (file="<? getRK("file"); ?>", envir=globalenv())
 <?
-	}
-	
-	function printout () {
-	// produce the output
-	}
-	
-	function cleanup () {
-	}
+}
+
+function printout () {
+}
+
 ?>

Modified: trunk/rkward/rkward/plugins/00saveload/load/source/code.php
===================================================================
--- trunk/rkward/rkward/plugins/00saveload/load/source/code.php	2007-03-18 23:39:50 UTC (rev 1626)
+++ trunk/rkward/rkward/plugins/00saveload/load/source/code.php	2007-03-18 23:57:28 UTC (rev 1627)
@@ -1,16 +1,14 @@
 <?
-	function preprocess () {
-	}
-	
-	function calculate () {
+function preprocess () {
+}
+
+function calculate () {
 ?>
 source (file="<? getRK("file"); ?>", local=<? getRK("local"); ?>, echo=<? getRK("echo"); ?>, print.eval= <? getRK("printeval"); ?>, verbose=<? getRK("verbose"); ?>, prompt.echo=<? getRK("promptecho"); ?>, max.deparse.length=<? getRK("maxdeparselength"); ?>, chdir=<? getRK("chdir"); ?>)
 <?
-	}
-	
-	function printout () {
-	}
-	
-	function cleanup () {
-	}
+}
+
+function printout () {
+}
+
 ?>

Modified: trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp	2007-03-18 23:39:50 UTC (rev 1626)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp	2007-03-18 23:57:28 UTC (rev 1627)
@@ -321,7 +321,7 @@
 	QString command = m_view->currentTextLine ();
 	if (!command.isEmpty ()) RKConsole::pipeUserCommand (new RCommand (command, RCommand::User, QString::null));
 
-	uint para=0; uint p=0;			// advance to next line (NOTE: m_view->down () won't work on auto-wrapped lines
+	uint para=0; uint p=0;			// advance to next line (NOTE: m_view->down () won't work on auto-wrapped lines)
 	m_view->cursorPosition (&para, &p);
 	m_view->setCursorPosition (para+1, p);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.