branch: externals/ess
commit b3c78d6f432b470f78a8e68c59e2d419e33f1dbd
Author: Lionel Henry <lionel....@gmail.com>
Commit: Lionel Henry <lionel....@gmail.com>
Add some dribble info for `ess-request-a-process`
Remove `inferior-ess-language-start` dribble because it was running at
a wrong time and redundant with the `ess-command` dribble.
---
lisp/ess-inf.el | 11 +++++++++--
lisp/ess-r-mode.el | 9 +++------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/lisp/ess-inf.el b/lisp/ess-inf.el
index f116bc336d..e450b4b038 100644
--- a/lisp/ess-inf.el
+++ b/lisp/ess-inf.el
@@ -207,7 +207,7 @@ This may be useful for debugging."
(run-hooks 'ess-post-run-hook)
;; User initialization can take some time ...
(unless no-wait
- (ess-write-to-dribble-buffer "(inferior-ess 3): waiting for process
after hook")
+ (ess-write-to-dribble-buffer "(inferior-ess): waiting for process
(after hook)\n")
(ess-wait-for-process proc)))
inf-buf)))
@@ -831,8 +831,10 @@ to `ess-completing-read'."
'ess-dialect
(process-buffer (get-process
(car pname-list))))))))
- ;; try to start "the appropriate" process, don't show the buffer
+ ;; Try to start "the appropriate" process, don't show the buffer
;; since we handle that explicitly with no-switch
+ (ess-if-verbose-write
+ "ess-request-a-process: Can't find a process, starting a new one\n")
(ess--with-no-pop-to-buffer
(ess-start-process-specific ess-language ess-dialect))
(setq num-processes 1
@@ -858,6 +860,8 @@ to `ess-completing-read'."
;; Prevent new process buffer from being popped
;; because we handle display depending on the value
;; of `no-switch`
+ (ess-if-verbose-write
+ "ess-request-a-process: User requested a new process\n")
(ess--with-no-pop-to-buffer
(ess-start-process-specific ess-language ess-dialect))
(caar ess-process-name-list))))))
@@ -871,6 +875,7 @@ to `ess-completing-read'."
;; If inferior startup has already finished, set screen
;; options again in case the post-run hook ran before a new
;; screen config was created by `pop-to-buffer' (#1243).
+ (ess-if-verbose-write "ess-request-a-process: starting hook\n")
(ess--execute-screen-options-bg))))
proc))
@@ -2232,6 +2237,8 @@ Also sets the \"length\" option to 99999. When INVISIBLY
is
non-nil, don't echo to R subprocess. This is a good thing to put
in `ess-r-post-run-hook' or `ess-S+-post-run-hook'."
(interactive)
+ (ess-if-verbose-write
+ (format "ess-execute-screen-options: invisibly=%s\n" invisibly))
(if (null ess-execute-screen-options-command)
(message "Not implemented for '%s'" ess-dialect)
(let ((command (ess-calculate-width 'window)))
diff --git a/lisp/ess-r-mode.el b/lisp/ess-r-mode.el
index 754a413280..70bfe2701e 100644
--- a/lisp/ess-r-mode.el
+++ b/lisp/ess-r-mode.el
@@ -616,10 +616,7 @@ will be prompted to enter arguments interactively."
(process-send-string (get-buffer-process inf-buf) "r\n"))
(ess-wait-for-process)
(ess-r-initialize-on-start)
- (comint-goto-process-mark))
- (ess-write-to-dribble-buffer
- (format "(R): inferior-ess-language-start=%s\n"
- inferior-ess-language-start)))
+ (comint-goto-process-mark)))
inf-buf)))
;;;###autoload
@@ -655,8 +652,8 @@ Executed in process buffer."
(ess-r-load-ESSR)
(when inferior-ess-language-start
(ess-command (concat inferior-ess-language-start "\n")))
- ;; tracebug
- (when ess-use-tracebug (ess-tracebug 1))
+ (when ess-use-tracebug
+ (ess-tracebug 1))
(add-hook 'ess-presend-filter-functions 'ess-R-scan-for-library-call nil
'local)
(run-hooks 'ess-r-post-run-hook))
