respect options(warn=-1); fixes yihui/knitr#610

r-lib · Sep 25, 2013 · 2caeebd · 2caeebd
1 parent 6ef58e2
commit 2caeebd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -14,6 +14,11 @@ BUG FIXES
 * the empty plots produced by strwidth(), strheight(), and clip() are no
   longer recorded
 
+MAJOR CHANGES
+
+* evaluate() no longer records warnings in case of options(warn = -1); see
+  yihui/knitr#610
+
 Version 0.4.7
 ------------------------------------------------------------------------------
 

diff --git a/R/eval.r b/R/eval.r
@@ -116,8 +116,10 @@ evaluate_call <- function(call, src = NULL,
 
   # Handlers for warnings, errors and messages
   wHandler <- if (keep_warning) function(wn) {
-    handle_condition(wn)
-    output_handler$warning(wn)
+    if (getOption("warn") >= 0) {
+      handle_condition(wn)
+      output_handler$warning(wn)
+    }
     invokeRestart("muffleWarning")
   } else identity
   eHandler <- if (use_try) function(e) {

diff --git a/inst/tests/test-evaluate.r b/inst/tests/test-evaluate.r
@@ -42,6 +42,11 @@ test_that("errors during printing visible values are captured", {
   stopifnot("error" %in% class(ev[[2]]))
 })
 
+test_that("options(warn = -1) suppresses warnings", {
+  ev <- evaluate("op = options(warn = -1); warning('hi'); options(op)")
+  expect_that(classes(ev), equals("source"))
+})
+
 op <- options(device = function(...) {
   pdf(file = NULL)
   dev.control("enable")