Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support user-defined prompts in availability check #1134

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Support user-defined prompts in availability check #1134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions lisp/ess-inf.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,7 @@ defined. If no project directory has been found, use
(when-let ((proc (or proc (and ess-local-process-name
(get-process ess-local-process-name)))))
(unless (process-get proc 'busy)
(or (ess-debug-active-p proc) ; don't send empty lines in debugger
(when-let ((last-check (process-get proc 'last-availability-check)))
(or (when-let ((last-check (process-get proc 'last-availability-check)))
(time-less-p (process-get proc 'last-eval) last-check))
(progn
;; Send an empty string and waiting a bit to make sure we are not busy.
Expand All @@ -393,9 +392,7 @@ Return non-nil if the process is in a ready (not busy) state."
(let ((ready (string-match-p (concat "\\(" inferior-ess-primary-prompt "\\)\\'") string)))
(process-put proc 'busy-end? (and ready (process-get proc 'busy)))
;; When "\n" inserted from inferior-ess-available-p, delete the prompt.
(when (and ready
(process-get proc 'availability-check)
(string-match-p (concat "^" inferior-ess-primary-prompt "\\'") string))
(when (and ready (process-get proc 'availability-check))
(process-put proc 'suppress-next-output? t))
(process-put proc 'availability-check nil)
(when ready
Expand Down