fixed issue for version 3.2 (work in progress)

textmate · May 14, 2015 · e9a9af0 · e9a9af0
1 parent 3449119
commit e9a9af0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Support/bin/RhelperScript.R b/Support/bin/RhelperScript.R
@@ -1,17 +1,17 @@
 TM_RdaemongetHelpURL <- function(x,...) {
 	if(getRversion()>='2.10.0') {
-		a<-gsub(".*/library/(.*?)/.*?/(.*?)(\\.html|$)",paste("http://127.0.0.1:",ifelse(tools:::httpdPort<1,tools::startDynamicHelp(T),tools:::httpdPort),"/library/\\1/html/\\2.html",sep=""),as.vector(help(x,try.all.packages=T,...)),perl=T)
+		a<-gsub(".*/library/(.*?)/.*?/(.*?)(\\.html|$)",paste("http://127.0.0.1:",ifelse(tools:::httpdPort()<1,tools::startDynamicHelp(T),tools:::httpdPort()),"/library/\\1/html/\\2.html",sep=""),as.vector(help(x,try.all.packages=T,...)),perl=T)
 		ifelse(length(a),cat(a,sep='\n'),cat("NA",sep=''))
 	} else {
 		a<-gsub("(.*?)/library/(.*?)/.*?/(.*?)(\\.html|$)","\\1/library/\\2/html/\\3.html",as.vector(help(x,try.all.packages=T,...)),perl=T)
 		ifelse(length(a),cat(a,sep='\n'),cat("NA",sep=''))
 	}
 }
 
-TM_RdaemongetHttpPort <- function() cat(ifelse(getRversion()>='2.10.0',ifelse(tools:::httpdPort<1,tools::startDynamicHelp(T),tools:::httpdPort),-2))
+TM_RdaemongetHttpPort <- function() cat(ifelse(getRversion()>='2.10.0',ifelse(tools:::httpdPort()<1,tools::startDynamicHelp(T),tools:::httpdPort()),-2))
 TM_RdaemongetSearchHelp <- function(x,ic=T) {
 	if (getRversion()>='2.10.0') {
-		p<-ifelse(tools:::httpdPort<1,tools::startDynamicHelp(T),tools:::httpdPort)
+		p<-ifelse(tools:::httpdPort()<1,tools::startDynamicHelp(T),tools:::httpdPort())
 		a<-help.search(x,ignore.case=ic)[[4]][,c(3,1)]
 		if(length(a)>0){
 			if(is.null(dim(a))) {a<-matrix(a,ncol=2)}