From: Christophe Rhodes Date: Wed, 1 Sep 2010 10:11:06 +0000 (+0100) Subject: use srcfile$wd when going to source for an sldb frame X-Git-Url: http://christophe.rhodes.io/gitweb/?p=swankr.git;a=commitdiff_plain;h=eb2756730af853555a941d7acb595c07169f3524;hp=1b24056279f85b8b6988f8d35eceaf98ba3dc615 use srcfile$wd when going to source for an sldb frame it worked before while emacs and R were started with the same working directory; this is not always going to be the case. --- diff --git a/swank.R b/swank.R index bd7e093..1316485 100644 --- a/swank.R +++ b/swank.R @@ -349,9 +349,8 @@ computeRestartsForEmacs <- function (sldbState) { if(is.null(srcfile)) { list(quote(`:error`), "no srcfile") } else { - filename <- get("filename", srcfile) list(quote(`:location`), - list(quote(`:file`), filename), + list(quote(`:file`), sprintf("%s/%s", srcfile$wd, srcfile$filename)), list(quote(`:line`), srcref[[1]], srcref[[2]]-1), FALSE) }