[elpa] externals/ess f307097eac 2/3: merge

[ELPA Syncer]

branch: externals/ess
commit f307097eac4d182986ed200924f92f14210a7c46
Merge: e49c85f9f2 d941b25f10
Author: Martin Maechler <maech...@r-project.org>
Commit: Martin Maechler <maech...@r-project.org>

    merge
---
 lisp/ess-r-flymake.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ess-r-flymake.el b/lisp/ess-r-flymake.el
index dae2467944..9df4402e14 100644
--- a/lisp/ess-r-flymake.el
+++ b/lisp/ess-r-flymake.el
@@ -90,7 +90,7 @@ each element is passed as argument to `lintr::with_defaults'."
         } else {
             tryCatch(lintr::lint(commandArgs(TRUE), ...),
                     error = function(e) {
-                       cat('@@warning: @@', e)
+                       cat('@@warning: @@', conditionMessage(e))
                     })
         }
     }