Skip to content

Commit 3a634c3

Browse files
jtoloemmaechler
authored andcommitted
Fix for version 3.0.0 or later of the lintr R package.
The lintr::with_defaults() function is deprecated. With this commit the lintr::linters_with_defaults() function is used instead.
1 parent 56f355a commit 3a634c3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lisp/ess-r-flymake.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"Default linters to use.
6363
Can be either a string with R expression to be used as
6464
is (e.g. `lintr::default_linters'). Or a list of strings where
65-
each element is passed as argument to `lintr::with_defaults'."
65+
each element is passed as argument to `lintr::linters_with_defaults'."
6666
:group 'ess-R
6767
:type '(choice string (repeat string))
6868
:package-version '(ess . "18.10"))
@@ -120,12 +120,12 @@ we couldn't find a .lintr file."
120120

121121
(defun ess-r--flymake-linters ()
122122
"If `ess-r-flymake-linters' is a string, use that.
123-
Otherwise, construct a string to pass to lintr::with_defaults."
123+
Otherwise, construct a string to pass to lintr::linters_with_defaults."
124124
(replace-regexp-in-string
125125
"[\n\t ]+" " "
126126
(if (stringp ess-r-flymake-linters)
127127
ess-r-flymake-linters
128-
(concat "lintr::with_defaults("
128+
(concat "lintr::linters_with_defaults("
129129
(mapconcat #'identity
130130
ess-r-flymake-linters
131131
", ")

0 commit comments

Comments
 (0)