Skip to content

Commit 3e84b0a

Browse files
committed
rename mpi-related vars and funs to use internal convention
As requested in #1182, rename any variables/functions that I've touched to begin with `ess--mpi` in order to follow the convention for "internal" features
1 parent a9784f9 commit 3e84b0a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

lisp/ess-tracebug.el

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,9 +1183,9 @@ Kill the *ess.dbg.[R_name]* buffer."
11831183

11841184
;; http://jkorpela.fi/chars/c0.html
11851185
;; https://en.wikipedia.org/wiki/ANSI_escape_code#Escape_sequences
1186-
(defvar ess-mpi-message-start-delimiter "\001")
1187-
(defvar ess-mpi-message-field-separator "\002")
1188-
(defvar ess-mpi-message-end-delimiter "\003")
1186+
(defvar ess--mpi-message-start-delimiter "\001")
1187+
(defvar ess--mpi-message-field-separator "\002")
1188+
(defvar ess--mpi-message-end-delimiter "\003")
11891189

11901190
(define-obsolete-variable-alias 'ess-mpi-alist 'ess-mpi-handlers "ESS 19.04")
11911191
(defvar ess-mpi-handlers
@@ -1227,7 +1227,7 @@ value from EXPR and then sent to the subprocess."
12271227
((string= el "t") t)
12281228
(t el)))
12291229

1230-
(defun ess-mpi-handle-messages (buf)
1230+
(defun ess--mpi-handle-messages (buf)
12311231
"Handle all mpi messages in BUF and delete them.
12321232
The MPI message has the form TYPEFIELD... where TYPE is the
12331233
type of the messages on which handlers in `ess-mpi-handlers' are
@@ -1240,15 +1240,15 @@ ends with an incomplete message."
12401240
;; This should be smarter because Emacs might cut it in the middle of the
12411241
;; message. In practice this almost never happen because we are
12421242
;; accumulating output into the cache buffer.
1243-
(while (search-forward ess-mpi-message-start-delimiter nil t)
1243+
(while (search-forward ess--mpi-message-start-delimiter nil t)
12441244
(let ((mbeg0 (match-beginning 0))
12451245
(mbeg (match-end 0)))
1246-
(if (search-forward ess-mpi-message-end-delimiter nil t)
1246+
(if (search-forward ess--mpi-message-end-delimiter nil t)
12471247
(let* ((mend (match-beginning 0))
12481248
(mend0 (match-end 0))
12491249
(msg (buffer-substring mbeg mend))
12501250
(payload (mapcar #'ess-mpi-convert
1251-
(split-string msg ess-mpi-message-field-separator)))
1251+
(split-string msg ess--mpi-message-field-separator)))
12521252
(head (pop payload))
12531253
(handler (cdr (assoc head ess-mpi-handlers))))
12541254
(unwind-protect
@@ -1325,7 +1325,7 @@ prompts."
13251325
;; Incomplete mpi should hardly happen. Only on those rare occasions
13261326
;; when an mpi is issued after a long task and split by the Emacs input
13271327
;; handler, or mpi printing itself takes very long.
1328-
(unless (eq :incomplete (ess-mpi-handle-messages abuf))
1328+
(unless (eq :incomplete (ess--mpi-handle-messages abuf))
13291329
(with-current-buffer abuf
13301330
;; Uncomment this line when debugging. This pops up the
13311331
;; accumulation buffer and causes point to follow

0 commit comments

Comments
 (0)