Skip to content

Commit df2ac1d

Browse files
musvaagemmaechler
authored andcommitted
warnings
1 parent cd85d1e commit df2ac1d

File tree

3 files changed

+25
-16
lines changed

3 files changed

+25
-16
lines changed

lisp/ess-inf.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; ess-inf.el --- Support for running S as an inferior Emacs process -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 1989-2023 Free Software Foundation, Inc.
3+
;; Copyright (C) 1989-2025 Free Software Foundation, Inc.
44

55
;; Author: David Smith <[email protected]>
66
;; Created: 7 Jan 1994
@@ -3143,7 +3143,7 @@ Uses `temp-buffer-show-function' and respects
31433143

31443144
(defun ess--inject-code-from-file (file &optional chunked)
31453145
"Load code from FILE into process.
3146-
If CHUNKED is non-nil, split the file by separator (must be at
3146+
If CHUNKED is non-nil, split the file by \\^L separator (must be at
31473147
bol) and load each chunk separately."
31483148
;; This is different from ess-load-file as it works by directly loading the
31493149
;; string into the process and thus works on remotes.

lisp/ess-r-mode.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; ess-r-mode.el --- R customization -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 1997-2022 Free Software Foundation, Inc.
3+
;; Copyright (C) 1997-2025 Free Software Foundation, Inc.
44
;; Author: A.J. Rossini
55
;; Created: 12 Jun 1997
66
;; Maintainer: ESS-core <[email protected]>
@@ -992,7 +992,7 @@ as `ess-r-created-runners' upon ESS initialization."
992992
(message "Recreated %d R versions known to ESS: %s"
993993
(length versions) versions))
994994
(if ess-microsoft-p
995-
(cl-mapcar (lambda (v p) (ess-define-runner v "R" p)) versions ess-rterm-version-paths)
995+
(cl-mapc (lambda (v p) (ess-define-runner v "R" p)) versions ess-rterm-version-paths)
996996
(mapc (lambda (v) (ess-define-runner v "R")) versions))
997997
;; Add to menu
998998
(when ess-r-created-runners
@@ -1619,7 +1619,7 @@ environment to the search path."
16191619
Send the contents of the etc/ESSR/R directory to the remote
16201620
process through the process connection file by file. Then,
16211621
collect all the objects into an ESSR environment and attach to
1622-
the search path. If CHUNKED is non-nil, split each file by
1622+
the search path. If CHUNKED is non-nil, split each file by \\^L
16231623
separators and send chunk by chunk."
16241624
(ess-command (format ".ess.ESSRversion <<- '%s'\n" essr-version))
16251625
(with-temp-message "Loading ESSR into remote ..."

lisp/ess-tracebug.el

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;; ess-tracebug.el --- Tracing and debugging facilities for ESS. -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2011-2022 Free Software Foundation, Inc.
3+
;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
44
;; Author: Vitalie Spinu
55
;; Maintainer: Vitalie Spinu
66
;; Created: Oct 14 14:15:22 2010
@@ -588,7 +588,7 @@ ESS internal code assumes default R prompts.")
588588
(setq-local compilation-error-regexp-alist ess-error-regexp-alist)
589589
(let (compilation-mode-font-lock-keywords)
590590
(compilation-setup t))
591-
(setq next-error-function 'ess-tracebug-next-error-function)
591+
(setq next-error-function #'ess-tracebug-next-error-function)
592592
;; new locals
593593
(make-local-variable 'ess--tb-last-input)
594594
(make-local-variable 'ess--tb-last-input-overlay)
@@ -1231,10 +1231,10 @@ value from EXPR and then sent to the subprocess."
12311231

12321232
(defun ess-mpi-handle-messages (buf)
12331233
"Handle all mpi messages in BUF and delete them.
1234-
The MPI message has the form TYPEFIELD... where TYPE is the
1234+
The MPI message has the form \\^[TYPE\\^^FIELD...\\^] where TYPE is the
12351235
type of the messages on which handlers in `ess-mpi-handlers' are
1236-
dispatched. And FIELDs are strings. Return :incomplete if BUF
1237-
ends with an incomplete message."
1236+
dispatched, \\^C are ASCII control chars, and FIELDs are strings.
1237+
Return `:incomplete' if BUF ends with an incomplete message."
12381238
(let ((obuf (current-buffer))
12391239
(out nil))
12401240
(with-current-buffer buf
@@ -1992,6 +1992,9 @@ Each sublist has five elements:
19921992
doesn't apply to current context."
19931993
:group 'ess-debug
19941994
:type '(alist :key-type symbol
1995+
;; FIXME: What's this `group'? The values looks like strings!
1996+
;; FIXME: The docstring talks about a 6th element (function)
1997+
;; but it's missing here.
19951998
:value-type (group string string symbol face)))
19961999

19972000
(defcustom ess-bp-inactive-spec
@@ -2001,7 +2004,8 @@ Each sublist has five elements:
20012004
;; `ess-bp-type-spec-alist' except that the second element giving
20022005
;; the R expression is meaningless here." ;;fixme: second element is missing make it nil for consistency with all other specs
20032006
:group 'ess-debug
2004-
:type 'list)
2007+
:type '(alist :key-type symbol
2008+
:value-type (group string string symbol face)))
20052009

20062010
(defcustom ess-bp-conditional-spec
20072011
'(conditional "browser(expr={%s})" "CB[ %s ]>\n" question-mark ess-bp-fringe-browser-face)
@@ -2011,14 +2015,16 @@ List format is identical to that of the elements of
20112015
expression to be replaced instead of %s in the second and third
20122016
elements of the specifications."
20132017
:group 'ess-debug
2014-
:type 'list)
2018+
:type '(alist :key-type symbol
2019+
:value-type (group string string symbol face)))
20152020

20162021
(defcustom ess-bp-logger-spec
20172022
'(logger ".ess_log_eval('%s')" "L[ \"%s\" ]>\n" hollow-square ess-bp-fringe-logger-face)
20182023
"List giving the loggers specifications.
20192024
List format is identical to that of `ess-bp-type-spec-alist'."
20202025
:group 'ess-debug
2021-
:type 'list)
2026+
:type '(alist :key-type symbol
2027+
:value-type (group string string symbol face)))
20222028

20232029

20242030
(defun ess-bp-get-bp-specs (type &optional condition no-error)
@@ -2339,7 +2345,7 @@ If there is no active R session, this command triggers an error."
23392345
(defun ess-bp-next nil
23402346
"Goto next breakpoint."
23412347
(interactive)
2342-
(when-let ((bp-pos (next-single-property-change (point) 'ess-bp)))
2348+
(when-let* ((bp-pos (next-single-property-change (point) 'ess-bp)))
23432349
(save-excursion
23442350
(goto-char bp-pos)
23452351
(when (get-text-property (1- (point)) 'ess-bp)
@@ -2352,7 +2358,7 @@ If there is no active R session, this command triggers an error."
23522358
(defun ess-bp-previous nil
23532359
"Goto previous breakpoint."
23542360
(interactive)
2355-
(if-let ((bp-pos (previous-single-property-change (point) 'ess-bp)))
2361+
(if-let* ((bp-pos (previous-single-property-change (point) 'ess-bp)))
23562362
(goto-char (or (previous-single-property-change bp-pos 'ess-bp)
23572363
bp-pos))
23582364
(message "No breakpoints before the point found")))
@@ -2820,7 +2826,10 @@ for signature and trace it with browser tracer."
28202826
"*ALL*"))
28212827
(setq fun (ess-completing-read "Undebug" debugged nil t nil nil def-val))
28222828
(if (equal fun "*ALL*" )
2823-
(ess-command (concat ".ess_dbg_UndebugALL(c(\"" (mapconcat 'identity debugged "\", \"") "\"))\n") tbuffer)
2829+
(ess-command (concat ".ess_dbg_UndebugALL(c(\""
2830+
(mapconcat #'identity debugged "\", \"")
2831+
"\"))\n")
2832+
tbuffer)
28242833
(ess-command (format ".ess_dbg_UntraceOrUndebug(\"%s\")\n" fun) tbuffer))
28252834
(with-current-buffer tbuffer
28262835
(if (= (point-max) 1) ;; not reliable TODO:

0 commit comments

Comments
 (0)