use !all(grepl()) instead of !grepl() because length(nm) could …

…be greater than one
r-lib · Sep 29, 2023 · 374f7b5 · 374f7b5
1 parent 2c157c6
commit 374f7b5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: evaluate
 Type: Package
 Title: Parsing and Evaluation Tools that Provide More Details than the Default
-Version: 0.21.1
+Version: 0.21.2
 Authors@R: c(
     person("Hadley", "Wickham", role = "aut"),
     person("Yihui", "Xie", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0003-0645-5666")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
 Version 0.22
 ================================================================================
 
+- Fixed a problem in the internal function `plot_calls()` that made the examples of `recordGraphics` fail to run on its help page (thanks, Kurt Hornik).
 
 Version 0.21
 ================================================================================

diff --git a/R/graphics.R b/R/graphics.R
@@ -65,7 +65,8 @@ plot_calls <- function(plot) {
     # grid graphics do not have x[[1]]$name
     if (!is.null(nm <- x[[1]][["name"]])) return(nm)
     nm <- deparse(x[[1]])
-    # the plot element should not be empty
-    if (length(x[[2]]) > 0 || !grepl("^requireNamespace\\(", nm)) nm
+    # the plot element should not be empty, and ignore calls that are simply
+    # requireNamespace()
+    if (length(x[[2]]) > 0 || !all(grepl("^requireNamespace\\(", nm))) nm
   }))
 }