[education/rkward] /: Fix lookup breakage in RMarkdown preview

Thomas Friedrichsmeier null at kde.org
Fri Oct 20 16:01:19 BST 2023


Git commit a16c695b3d1a2222b461223dc18e329485b8f56e by Thomas Friedrichsmeier.
Committed on 20/10/2023 at 17:01.
Pushed by tfry into branch 'master'.

Fix lookup breakage in RMarkdown preview

M  +1    -1    VERSION.cmake
M  +1    -1    rkward/rbackend/rpackages/rkward/DESCRIPTION
M  +6    -6    rkward/rbackend/rpackages/rkward/R/internal_graphics.R

https://invent.kde.org/education/rkward/-/commit/a16c695b3d1a2222b461223dc18e329485b8f56e

diff --git a/VERSION.cmake b/VERSION.cmake
index b12851076..b06375783 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,3 +1,3 @@
 # DO NOT CHANGE THIS FILE MANUALLY!
 # It will be overwritten by scripts/set_dist_version.sh
-SET(RKVERSION_NUMBER 0.7.5z+0.7.6+devel2)
+SET(RKVERSION_NUMBER 0.7.5z+0.7.6+devel3)
diff --git a/rkward/rbackend/rpackages/rkward/DESCRIPTION b/rkward/rbackend/rpackages/rkward/DESCRIPTION
index f7d650132..401b53a70 100755
--- a/rkward/rbackend/rpackages/rkward/DESCRIPTION
+++ b/rkward/rbackend/rpackages/rkward/DESCRIPTION
@@ -19,7 +19,7 @@ Authors at R: c(person(given="Thomas", family="Friedrichsmeier",
         role=c("aut")), person(family="the RKWard team",
         email="rkward-devel at kde.org", role=c("cre","aut")))
 Version: 0.7.6
-Date: 2023-10-14
+Date: 2023-10-20
 RoxygenNote: 7.2.2
 Collate: 
     'base_overrides.R'
diff --git a/rkward/rbackend/rpackages/rkward/R/internal_graphics.R b/rkward/rbackend/rpackages/rkward/R/internal_graphics.R
index fc1bce7e5..552dee918 100644
--- a/rkward/rbackend/rpackages/rkward/R/internal_graphics.R
+++ b/rkward/rbackend/rpackages/rkward/R/internal_graphics.R
@@ -91,7 +91,7 @@ assign(".rk.preview.devices", list (), envir=.rk.variables)
 	rk.replace.function ("plot.new", as.environment ("package:graphics"),
 		function () {
 			rk.record.plot$.plot.new.hook ()
-			eval (body (.rk.backups$plot.new))
+			eval(body(rkward:::.rk.backups$plot.new))
 		})
 
 	rk.replace.function ("dev.off", as.environment ("package:grDevices"),
@@ -100,17 +100,17 @@ assign(".rk.preview.devices", list (), envir=.rk.variables)
 				rk.record.plot$onDelDevice (devId = which)
 			
 			# see http://thread.gmane.org/gmane.comp.statistics.rkward.devel/802
-			.rk.do.call ("killDevice", as.character (which))
+			rkward:::.rk.do.call("killDevice", as.character(which))
 			
-			ret <- eval (body (.rk.backups$dev.off))
+			ret <- eval(body(rkward:::.rk.backups$dev.off))
 
 			printfile <- .rk.variables$.rk.printer.devices[[as.character (which)]]
 			if (!is.null (printfile)) {
-				.rk.do.plain.call ("printPreview", printfile, FALSE)
-				.rk.variables$.rk.printer.devices[[as.character (which)]] <- NULL
+				rkward:::.rk.do.plain.call ("printPreview", printfile, FALSE)
+				rkward:::.rk.variables$.rk.printer.devices[[as.character (which)]] <- NULL
 			}
 
-			.rk.discard.preview.device.num(which)
+			rkward:::.rk.discard.preview.device.num(which)
 
 			return (ret)
 		})


More information about the rkward-tracker mailing list