Merge pull request #720 from rundel/issue#689

Handle malformed version information from INSIDE_EMACS

NEWS.md

@@ -1,5 +1,8 @@
 # cli (development version)
 
+* `num_ansi_colors()` now does not warn in Emacs if the `INSIDE_EMACS`
+  environment variable is not a proper version number (@rundel, #689).
+
 * `ansi_collapse()` and inline collapsing now uses `last` as the separator
   (without the serial comma) for two-element vectors if `sep2` is not
   given (@rundel, #681).

R/num-ansi-colors.R

@@ -310,9 +310,10 @@ emacs_version <- function() {
   if (ver == "") return(NA_integer_)
 
   ver <- gsub("'", "", ver)
+
   ver <- strsplit(ver, ",", fixed = TRUE)[[1]]
   ver <- strsplit(ver, ".", fixed = TRUE)[[1]]
-  as.numeric(ver)
+  suppressWarnings(as.numeric(ver))
 }
 
 win10_build <- function() {

tests/testthat/test-num-ansi-colors.R

@@ -180,3 +180,19 @@ test_that("ESS_BACKGROUND_MODE", {
   withr::local_envvar(ESS_BACKGROUND_MODE = "dark")
   expect_true(detect_dark_theme("auto"))
 })
+
+test_that("emacs_version", {
+  withr::local_envvar(INSIDE_EMACS = "")
+  expect_true(is.na(emacs_version()))
+  withr::local_envvar(INSIDE_EMACS = "foobar")
+  expect_true(is.na(emacs_version()))
+
+  withr::local_envvar(INSIDE_EMACS = "23.2.3")
+  expect_equal(emacs_version(), c(23, 2, 3))
+  withr::local_envvar(INSIDE_EMACS = "23.2.3,foobar")
+  expect_equal(emacs_version(), c(23, 2, 3))
+  withr::local_envvar(INSIDE_EMACS = "'23.2.3'")
+  expect_equal(emacs_version(), c(23, 2, 3))
+  withr::local_envvar(INSIDE_EMACS = "'23.2.3',foobar")
+  expect_equal(emacs_version(), c(23, 2, 3))
+})