Minor code tweaks (#28)

arnaudgallou · Oct 22, 2024 · 2b8249b · 2b8249b
1 parent 9698c08
commit 2b8249b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/checkers.R b/R/checkers.R
@@ -24,7 +24,7 @@ is_bib <- function(x) {
 }
 
 is_updating_bib <- function(x) {
-  is_rendering() && names(x) == "bib"
+  is_rendering() && names(x) == "bib" && x != get("bib")
 }
 
 is_unit_set <- function(x) {
@@ -83,7 +83,7 @@ caller_arg <- function() {
   deparse(substitute(x, env = parent.frame()))
 }
 
-check_type <- function(x, asserter, expected, arg = caller_arg()) {
+check_type <- function(x, asserter, expected, arg) {
   if (asserter(x)) {
     return(invisible())
   }

diff --git a/R/pkrt-set.R b/R/pkrt-set.R
@@ -53,11 +53,11 @@ reset <- function(x) {
 }
 
 update <- function(x) {
-  do.call(set, as.list(x))
   if (is_updating_bib(x)) {
     bib_write()
-    bib_set()
+    withr::defer(bib_set())
   }
+  do.call(set, as.list(x))
 }
 
 set_option <- function(x) {