[rkward/frameworks] /: Fix breakage with trellis plots, when lattice is imported as a namespace, only, not on the search path.

[Thomas Friedrichsmeier]

Git commit 09e4e14c41439d9297d2d02708dab7f106bdb97c by Thomas Friedrichsmeier.
Committed on 04/06/2017 at 19:00.
Pushed by tfry into branch 'frameworks'.

Fix breakage with trellis plots, when lattice is imported as a namespace, only, not on the search path.

BUG: 362825

M  +1    -0    ChangeLog
M  +1    -1    rkward/rbackend/rpackages/rkward/R/public_graphics.R

https://commits.kde.org/rkward/09e4e14c41439d9297d2d02708dab7f106bdb97c

diff --git a/ChangeLog b/ChangeLog
index 5f8a4835..63628d37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+- Fixed: Creating trellis on-screen plots, while package lattice is not on the search path would produce errors in plot history mechanism
 - Limit the number of debug log-files to keep (at most three, each, for frontend and backend)
 - Remove Windows-only UI for setInternet2()-option (no longer available in R, with setInternet2(TRUE) the default since R 3.2.2)
 - Remove startup wrapper script (moving the still-needed functionality into the main executable)
diff --git a/rkward/rbackend/rpackages/rkward/R/public_graphics.R b/rkward/rbackend/rpackages/rkward/R/public_graphics.R
index 5235e20d..d7641881 100644
--- a/rkward/rbackend/rpackages/rkward/R/public_graphics.R
+++ b/rkward/rbackend/rpackages/rkward/R/public_graphics.R
@@ -428,7 +428,7 @@
 		# store the "lattice.status" into each device specific list, so that, if/when removing
 		# one of the displayed plots, the other can still be re-added back in the history.
 		devId <- as.character (devId)
-		histPositions [[devId]]$plot <<- trellis.last.object ()
+		histPositions [[devId]]$plot <<- lattice:::trellis.last.object ()
 		histPositions [[devId]]$tlo.ls <<- get ("lattice.status", envir = lattice:::.LatticeEnv)
 		invisible ()
 	}