[Sciviews-commits] r524 - in pkg: SciViews SciViews/R tcltk2 tcltk2/man

[noreply at r-forge.r-project.org]

Author: phgrosjean
Date: 2013-01-28 00:07:09 +0100 (Mon, 28 Jan 2013)
New Revision: 524

Modified:
   pkg/SciViews/NEWS
   pkg/SciViews/R/SciViews-internal.R
   pkg/SciViews/R/misc.R
   pkg/tcltk2/DESCRIPTION
   pkg/tcltk2/NAMESPACE
   pkg/tcltk2/NEWS
   pkg/tcltk2/man/tcltk2-package.Rd
Log:
tcltk2 1.2-4 preparation for submission to CRAN
SciViews: adapation of NEWS to latest changes recently made 

Modified: pkg/SciViews/NEWS
===================================================================
--- pkg/SciViews/NEWS	2013-01-27 22:38:51 UTC (rev 523)
+++ pkg/SciViews/NEWS	2013-01-27 23:07:09 UTC (rev 524)
@@ -4,7 +4,9 @@
 
 * Import from data.table is eliminated. For now, `@:=` is the same as `@<-`.
 
+* Temporary objects are now saved in SciViews:TempEnv instead of TempEnv.
 
+
 == SciViews version 0.9-9
 
 * Improvements to activate warnings regarding possible R traps: if

Modified: pkg/SciViews/R/SciViews-internal.R
===================================================================
--- pkg/SciViews/R/SciViews-internal.R	2013-01-27 22:38:51 UTC (rev 523)
+++ pkg/SciViews/R/SciViews-internal.R	2013-01-27 23:07:09 UTC (rev 524)
@@ -54,18 +54,19 @@
 }
 
 ## Code borrowed from svMisc, to avoid a dependency!
+.TempEnv_ <- function () {
+	pos <-  match("SciViews:TempEnv", search())
+	if (is.na(pos)) { # Must create it
+	    `SciViews:TempEnv` <- list()
+	    attach(`SciViews:TempEnv`, pos = length(search()) - 1)
+	    rm(`SciViews:TempEnv`)
+	    pos <- match("SciViews:TempEnv", search())
+	}
+	pos.to.env(pos)
+}
+	
 .assignTemp <- function (x, value, replace.existing = TRUE) {
-    .TempEnv <- function () {
-		pos <-  match("SciViews:TempEnv", search())
-		if (is.na(pos)) { # Must create it
-		    `SciViews:TempEnv` <- list()
-		    attach(`SciViews:TempEnv`, pos = length(search()) - 1)
-		    rm(`SciViews:TempEnv`)
-		    pos <- match("SciViews:TempEnv", search())
-		}
-		pos.to.env(pos)
-	}
-	TempEnv <- .TempEnv()
+	TempEnv <- .TempEnv_()
 	if (isTRUE(replace.existing) || !exists(x, envir = TempEnv, mode = "any",
 		inherits = FALSE))
         assign(x, value, envir = TempEnv)

Modified: pkg/SciViews/R/misc.R
===================================================================
--- pkg/SciViews/R/misc.R	2013-01-27 22:38:51 UTC (rev 523)
+++ pkg/SciViews/R/misc.R	2013-01-27 23:07:09 UTC (rev 524)
@@ -468,8 +468,8 @@
 autoloadEnv <- function () return(.AutoloadEnv)
 #.AutoloadEnv already defined
 #TempEnv() in svMisc
-tempEnv <- .TempEnv()
-.TempEnv <- TempEnv()
+tempEnv <- .TempEnv_()
+.TempEnv <- .TempEnv_()
 ## TODO: or sys.topEnv()???
 ## RCMD check claims he cannot find isNamespaceEnv() in topEnv() => provide it
 isNamespaceEnv <- function (envir = parentFrame())

Modified: pkg/tcltk2/DESCRIPTION
===================================================================
--- pkg/tcltk2/DESCRIPTION	2013-01-27 22:38:51 UTC (rev 523)
+++ pkg/tcltk2/DESCRIPTION	2013-01-27 23:07:09 UTC (rev 524)
@@ -1,7 +1,7 @@
 Package: tcltk2
 Type: Package
-Version: 1.2-3
-Date: 2012-05-01
+Version: 1.2-4
+Date: 2013-01-27
 Title: Tcl/Tk Additions
 Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
   email = "phgrosjean at sciviews.org"))

Modified: pkg/tcltk2/NAMESPACE
===================================================================
--- pkg/tcltk2/NAMESPACE	2013-01-27 22:38:51 UTC (rev 523)
+++ pkg/tcltk2/NAMESPACE	2013-01-27 23:07:09 UTC (rev 524)
@@ -117,8 +117,7 @@
        visibleItem,
        size,
        config,
-       "config<-",
-       .Last.lib)
+       "config<-")
 
 S3method(print, tclTask)
 S3method(tip, tk2widget)

Modified: pkg/tcltk2/NEWS
===================================================================
--- pkg/tcltk2/NEWS	2013-01-27 22:38:51 UTC (rev 523)
+++ pkg/tcltk2/NEWS	2013-01-27 23:07:09 UTC (rev 524)
@@ -1,5 +1,10 @@
 = tcltk2 news
 
+== Version 1.3-4
+
+* Temporary objects are now located in SciViews:TempEnv instead of TempEnv.
+
+
 == Version 1.2-3
 
 * The Tk configuration sequence in .onLoad() is changed. 

Modified: pkg/tcltk2/man/tcltk2-package.Rd
===================================================================
--- pkg/tcltk2/man/tcltk2-package.Rd	2013-01-27 22:38:51 UTC (rev 523)
+++ pkg/tcltk2/man/tcltk2-package.Rd	2013-01-27 23:07:09 UTC (rev 524)
@@ -16,8 +16,8 @@
 \tabular{ll}{
 Package: \tab tcltk2\cr
 Type: \tab Package\cr
-Version: \tab 1.2-3\cr
-Date: \tab 2012-05-01\cr
+Version: \tab 1.2-4\cr
+Date: \tab 2013-01-27\cr
 License: \tab see LICENSE file\cr
 LazyLoad: \tab yes\cr
 }