branch: externals/ess
commit f1ef0d84cbe67d5d771cad922fa8c87b1473b70d
Author: Lionel Henry <[email protected]>
Commit: Lionel Henry <[email protected]>
Make delimiter detection robust to carriage returns
`R -d lldb` adds two ^M on my macOS machine
---
lisp/ess-inf.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/ess-inf.el b/lisp/ess-inf.el
index facc86416a..dcba820aaa 100644
--- a/lisp/ess-inf.el
+++ b/lisp/ess-inf.el
@@ -478,10 +478,10 @@ inserted in the process buffer instead of the command
buffer."
(process-put proc 'busy nil))))
(defun ess--delimiter-start-re (delim)
- (concat "\\(" delim "-START$\\)"))
+ (concat "\\(" delim "-START\r*$\\)"))
(defun ess--delimiter-end-re (delim)
- (concat "\\(" delim "-END\\)"))
+ (concat "\\(" delim "-END\r*\\)"))
(defun inferior-ess-mark-as-busy (proc)
"Put PROC's busy value to t."
