Prepare for R marking useBytes = TRUE results as 'bytes'

More info: r-lib/cli#495

DESCRIPTION

@@ -28,6 +28,7 @@ Collate:
     'utils.r'
     'crayon-package.r'
     'disposable.r'
+    'enc-utils.R'
     'has_ansi.r'
     'has_color.r'
     'link.R'

R/aab-num-ansi-colors.R

@@ -304,7 +304,7 @@ emacs_version <- function() {
   ver <- Sys.getenv("INSIDE_EMACS")
   if (ver == "") return(NA_integer_)
 
-  ver <- gsub("'", "", ver, useBytes = TRUE)
+  ver <- gsub("'", "", ver)
   ver <- strsplit(ver, ",", fixed = TRUE)[[1]]
   ver <- strsplit(ver, ".", fixed = TRUE)[[1]]
   as.numeric(ver)

R/enc-utils.R

@@ -0,0 +1,25 @@
+
+# keep encoding, even if useBytes = TRUE
+
+sub_ <- function(pattern, replacement, x, ...) {
+  enc <- Encoding(x)
+  ret <- sub(pattern, replacement, x, ...)
+  if (length(ret)) Encoding(ret) <- enc
+  ret
+}
+
+gsub_ <- function(pattern, replacement, x, ...) {
+  enc <- Encoding(x)
+  ret <- gsub(pattern, replacement, x, ...)
+  if (length(ret)) Encoding(ret) <- enc
+  ret
+}
+
+strsplit_ <- function(x, ...) {
+  enc <- Encoding(x)
+  ret <- strsplit(x, ...)
+  for (i in seq_along(ret)) {
+    Encoding(ret[[i]]) <- enc[i]
+  }
+  ret
+}

R/has_ansi.r

@@ -30,5 +30,5 @@ has_style <- function(string) {
 #' strip_style(red("foobar")) == "foobar"
 
 strip_style <- function(string) {
-  gsub(ansi_regex, "", string, perl = TRUE, useBytes = TRUE)
+  gsub_(ansi_regex, "", string, perl = TRUE, useBytes = TRUE)
 }

R/machinery.r

@@ -9,7 +9,7 @@ crayon_template <- function(...) {
     for (st in rev(my_styles)) {
       if (!is.null(st$palette)) st <- get_palette_color(st, nc)
       text <- st$open %+%
-        gsub(st$close, st$open, text, fixed = TRUE, useBytes = TRUE) %+%
+        gsub_(st$close, st$open, text, fixed = TRUE, useBytes = TRUE) %+%
         st$close
     }
   }

R/utils.r

@@ -95,7 +95,7 @@ myseq <- function(from, to, by = 1) {
 
 emacs_version <- function() {
   ver <- Sys.getenv("INSIDE_EMACS")
-  ver <- gsub("[^0-9\\.]+", "", ver, useBytes = TRUE)
+  ver <- gsub("[^0-9\\.]+", "", ver)
   if (ver == "") return(NA_integer_)
   ver <- strsplit(ver, ".", fixed = TRUE)[[1]]
   as.numeric(ver)