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

[tfry at users.sf.net]

Revision: 4754
          http://sourceforge.net/p/rkward/code/4754
Author:   tfry
Date:     2013-05-23 18:15:22 +0000 (Thu, 23 May 2013)
Log Message:
-----------
Adjust to (re-)named parameters for options('pager')

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2013-05-17 08:23:33 UTC (rev 4753)
+++ trunk/rkward/ChangeLog	2013-05-23 18:15:22 UTC (rev 4754)
@@ -1,3 +1,4 @@
+- Fixed: Adjust to (re-?)named parameters for options("pager")
 - Allow plugin UI script code to query R for information
 	TODO: - document
 	      - piece all the new features together and implement an embeddable level selector plugin on top of this

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R	2013-05-17 08:23:33 UTC (rev 4753)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R	2013-05-23 18:15:22 UTC (rev 4754)
@@ -61,9 +61,11 @@
 
 #' @export
 #' @rdname rk.edit
-"rk.show.files" <- function (file = file, title = file, wtitle = NULL, delete=FALSE, prompt = TRUE)
+"rk.show.files" <- function (file = file, header = file, title = NULL, delete.file=FALSE, prompt = TRUE,
+	delete = delete.file  # For compatibility with earlier versions of R
+)
 {
-	invisible (.Call ("rk.show.files", as.character (file), as.character (title), as.character (wtitle), delete, isTRUE (prompt), PACKAGE="(embedding)"))
+	invisible (.Call ("rk.show.files", as.character (file), as.character (header), as.character (title), delete, isTRUE (prompt), PACKAGE="(embedding)"))
 }
 
 #' @export