no need to restore opts_knit and opts_chunk on my side; fixed #105

the old approach of restoring options is buggy due to some NULL items in the list
yihui · Jan 25, 2012 · 9f36873 · 9f36873
1 parent 7c1e371
commit 9f36873
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/R/output.R b/R/output.R
@@ -96,10 +96,8 @@ knit = function(input, output, tangle = FALSE, text = NULL) {
     }
 
     owd = setwd(dirname(input)); on.exit(setwd(owd), add = TRUE)
-    optk = opts_knit$get(); on.exit(opts_knit$set(optk), add = TRUE)
-    optc = opts_chunk$get(); on.exit(opts_chunk$set(optc), add = TRUE)
     opts_knit$set(input.dir = getwd())  # record current working dir
-    if (is.null(optk$out.format)) {
+    if (is.null(opts_knit$get('out.format'))) {
         fmt =
             switch(ext, rnw = 'latex', tex = 'latex', html = 'html', md = 'jekyll',
                    brew = 'brew',