Fix tests for emacs 29

Author: vspinu

lisp/ess-help.el

@@ -271,7 +271,8 @@ TITLE of the help page,
 HELP-TYPE to be stored in `ess-help-type' local variable,
 ACTION is a function with no argument (default is `ess--button-action'),
 HELP-ECHO if given becomes the help-echo property of the button,
-REG-START gives the start location from where to search linkifying, and HELP-OBJECT becomes `ess-help-object'."
+REG-START gives the start location from where to search linkifying,
+          and HELP-OBJECT becomes `ess-help-object'."
   (let ((inhibit-modification-hooks t)
         (alist          ess-local-customize-alist)
         (pname ess-local-process-name)

lisp/ess-inf.el

@@ -2209,8 +2209,8 @@ A negative prefix argument gets the objects for that position
     (ess-execute the-command invert "S objects" the-message)))
 
 (defun ess-execute-search (invert)
-  "Send the `inferior-ess-search-list-command' command to the `ess-language' process.
-[search(..) in S]"
+  "Send the `inferior-ess-search-list-command' command.
+INVERT is as in `ess-execute'. E.g. search(..) in S."
   (interactive "P")
   (ess-execute inferior-ess-search-list-command  invert "S search list"))
 
@@ -2246,7 +2246,8 @@ in `ess-r-post-run-hook' or `ess-S+-post-run-hook'."
 (defun ess-calculate-width (opt)
   "Calculate width command given OPT.
 OPT can be 'window, 'frame, or an integer. Return a command
-suitable to send to the inferior process (e.g. \"options(width=80, length=999999)\")."
+suitable to send to the inferior process (e.g.
+\"options(width=80, length=999999)\")."
   (when (null ess-execute-screen-options-command)
     (error "Not implemented for %s" ess-dialect))
   (let (command)
@@ -2716,7 +2717,7 @@ directory in the `load-path'."
     (setq ess-object-name-db temp-object-name-db)))
 
 (defun ess-resynch nil
-  "Reread all directories/objects in variable `ess-search-list' to form completions."
+  "Reread all directories and objects in `ess-search-list' for completions."
   (interactive)
   (if (ess-make-buffer-current) nil
     (error "Not an ESS process buffer"))

lisp/ess-julia.el

@@ -118,14 +118,14 @@ See `comint-input-sender'."
 
 ;;; COMPLETION
 (defun ess-julia-latexsub-completion ()
-  "Complete latex input, and return format required by `completion-at-point-functions'."
+  "Complete latex input in format required by `completion-at-point-functions'."
   (if (julia-latexsub) ; julia-latexsub returns nil if it performed a completion, the point otherwise
       nil
     (lambda () t) ;; bypass other completion methods
     ))
 
 (defun ess-julia-object-completion ()
-  "Return completions at point in a format required by `completion-at-point-functions'."
+  "Return completions in format required by `completion-at-point-functions'."
   (let ((proc (ess-get-next-available-process ess-dialect t))
         (beg (ess-symbol-start)))
     (if proc

lisp/ess-r-completion.el

@@ -145,7 +145,7 @@ to look up any doc strings."
 ;;;*;;; OBJECTS
 
 (defun ess-r-object-completion ()
-  "Return completions at point in a format required by `completion-at-point-functions'."
+  "Return completions at point as required in `completion-at-point-functions'."
   (if (ess-make-buffer-current)
       (let* ((funstart (cdr (ess--fn-name-start)))
              (completions (ess-r-get-rcompletions funstart))

lisp/ess-r-mode.el

@@ -839,8 +839,8 @@ Returns either Name, a string, or a (Name . Path) cons, such as
 (\"R-2.12.1-64bit\"  .  \"C:/Program Files/R/R-2.12.1/bin/x64/Rterm.exe\")
 
 \"R-x.y.z/bin/Rterm.exe\" will return \"R-x.y.z\", for R-2.11.x and older.
-\"R-x.y.z/bin/i386/Rterm.exe\" will return \"R-x.y.z-32bit\", for R-2.12.x and newer.
-\"R-x.y.z/bin/x64/Rterm.exe\"  will return \"R-x.y.z-64bit\", for R-2.12.x and newer."
+\"R-x.y.z/bin/i386/Rterm.exe\" return \"R-x.y.z-32bit\", for R-2.12.x and newer.
+\"R-x.y.z/bin/x64/Rterm.exe\"  return \"R-x.y.z-64bit\", for R-2.12.x and newer."
   (let* ((dir  (directory-file-name (file-name-directory long-path)))
          (dir2 (directory-file-name (file-name-directory dir)))
          (v-1up (file-name-nondirectory dir));; one level up
@@ -896,7 +896,8 @@ as `ess-r-created-runners' upon ESS initialization."
 
 (defun ess-r-redefine-runners (&optional verbose)
   "Regenerate runners, i.e. `M-x R-*` possibilities.
- Call `fmakunbound' on all elements of `ess-r-created-runners', then define new runners."
+ Call `fmakunbound' on all elements of `ess-r-created-runners',
+ then define new runners."
   (interactive "P")
   (dolist (f ess-r-created-runners)
     (fmakunbound (intern f)))
@@ -2112,14 +2113,12 @@ Returns nil if line starts inside a string, t if in a comment."
 ;; Unroll arguments to a single line until closing marker is found.
 (defun ess-fill--unroll-lines (bounds &optional jump-cont)
   (let* ((last-pos (point-min))
-         (containing-sexp (ess-containing-sexp-position))
-         prefix-break)
+         (containing-sexp (ess-containing-sexp-position)))
     (goto-char (car bounds))
     (goto-char (ess-code-end-position))
     (while (and (/= (point) last-pos)
                 (< (line-end-position)
-                   (cadr bounds))
-                (not prefix-break))
+                   (cadr bounds)))
       (setq last-pos (point))
       ;; Check whether we ended up in a sub call. In this case, jump
       ;; over it, otherwise, join lines.
@@ -2415,8 +2414,8 @@ state.")
   (setq comint-get-old-input #'inferior-ess-get-old-input)
   (add-hook 'comint-input-filter-functions 'ess-search-path-tracker nil 'local))
 
-
 
+
 ;;;*;;; R Help mode
 
 (defvar ess-r-help-mode-map

lisp/ess-r-package.el

@@ -104,9 +104,13 @@ is searched from that directory instead of `default-directory'."
     (when (car pkg-info)
       (cons 'ess-r-package (plist-get pkg-info :root)))))
 
-(cl-defmethod project-roots ((project (head ess-r-package)))
-  "Return the project root for ESS R packages"
-  (list (cdr project)))
+
+;; FIXME: remove when emacs 27 is dropped
+(unless (eval-when-compile
+          (get 'project-roots 'byte-obsolete-info))
+  (cl-defmethod project-roots ((project (head ess-r-package)))
+    "Return the project root for ESS R packages"
+    (list (cdr project))))
 
 (cl-defmethod project-root ((project (head ess-r-package)))
   "Return the project root for ESS R packages"

lisp/ess-r-xref.el

@@ -87,7 +87,7 @@ srcrefs point to temporary locations."
           (read (current-buffer)))))))
 
 (defun ess-r-xref--pkg-srcfile (symbol src-file &optional default-pkg)
-  "Look in the source directory of the R package containing symbol SYMBOL for SRC-FILE.
+  "Search the R package containing symbol SYMBOL for file SRC-FILE.
 DEFAULT-PKG is the name of the package where presumably SYMBOL is located."
   (let* ((pkgs (delq nil
                      (delete-dups

lisp/ess-s-lang.el

@@ -262,7 +262,8 @@ Optional argument VERBOSE gives more verbose output."
 
 (defun ess-fix-dot (before-chars &optional dont-query verbose)
   "Remove trailing decimal '.' (\"dot\"), before BEFORE-CHARS.
-Optional argument DONT-QUERY and VERBOSE get passed to `ess-replace-regexp-dump-to-src'."
+Optional argument DONT-QUERY and VERBOSE get passed to
+`ess-replace-regexp-dump-to-src'."
   ;; typically, before-chars =  "]:" or more
   (ess-replace-regexp-dump-to-src
    (concat "\\([0-9]\\)\\.\\( *[" before-chars "]\\)")

lisp/ess-sas-d.el

@@ -256,7 +256,9 @@ Better logic needed!  (see 2 uses, in this file).")
 
 ;; rmh Jul 10 2003
 (defun ess-electric-run-semicolon (arg)
-  "Insert character.  If the line contains \"run;\" or \"quit;\" and nothing else then indent line."
+  "Insert character.
+If the line contains \"run;\" or \"quit;\" and nothing else then
+indent line."
   (interactive "P")
   (if ess-sas-edit-keys-toggle (insert ";") (let (insertpos)
                                               (if (and (not arg)

lisp/ess-tracebug.el

@@ -949,7 +949,8 @@ The action list is in `ess-debug-error-action-alist'."
   (move-marker ess--dbg-current-debug-position (point-at-bol)))
 
 (defun ess--dbg-deactivate-overlays ()
-  "Deletes markers and overlays. Overlay arrow remains to indicate the last debug position."
+  "Delete debugger markers and overlays.
+Overlay arrow remains to indicate the last debug position."
   (delete-overlay ess--dbg-current-debug-overlay)
   (set-marker ess--dbg-current-debug-position nil))
 
@@ -1533,7 +1534,7 @@ the output into *ess.dbg* buffer."
   :keymap ess-debug-minor-mode-map)
 
 (defun ess--dbg-goto-last-ref-and-mark (dbuff &optional other-window)
-  "Open the most recent debug reference, and set all the necessary marks and overlays.
+  "Open the most recent debug reference and set the necessary marks and overlays.
 It's called from `inferior-ess-tracebug-output-filter'. DBUFF
 must be the *ess.dbg* buffer associated with the process. If
 OTHER-WINDOW is non nil, attempt to open the location in a
@@ -2467,8 +2468,10 @@ string giving the actual R expression."
       wal)))
 
 (defun ess-watch--parse-assoc (al)
-  "Return a string of the form 'assign(\".ess_watch_expressions\", list(a = parse(expr_a), b= parse(expr_b)), envir = .GlobalEnv)'
-ready to be send to R process. AL is an association list as return by `ess-watch--make-alist'"
+  "Return a string command ready to be passed to R process.
+The command is of the form 'assign(\".ess_watch_expressions\",
+list(a = parse(expr_a), b= parse(expr_b)), envir = .GlobalEnv)'.
+AL is an association list as return by `ess-watch--make-alist'"
   (concat ".ess_watch_assign_expressions(list("
           (mapconcat (lambda (el)
                        (if (> (length  (cadr el) ) 0)
@@ -2574,7 +2577,7 @@ Optional N if supplied gives the number of backward steps."
     (ess-watch-refresh-buffer-visibly (current-buffer))))
 
 (defun ess-watch-add ()
-  "Ask for new R expression and name and append it to the end of the list of watch expressions."
+  "Ask for new R expression and append to the current list of watch expressions."
   (interactive)
   (let (nr expr name)
     (goto-char (point-max))